--- kdebase-3.5.6.orig/ktip/pics/Makefile.in +++ kdebase-3.5.6/ktip/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ktip/Makefile.in +++ kdebase-3.5.6/ktip/Makefile.in @@ -167,6 +167,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -310,6 +311,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -360,6 +364,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -367,12 +372,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -393,10 +395,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -405,6 +410,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -566,6 +572,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -573,10 +580,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -614,7 +623,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -652,9 +661,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksplashml/pics/Makefile.in +++ kdebase-3.5.6/ksplashml/pics/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -571,7 +580,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -609,9 +618,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/pics/themes/default/locolor/Makefile.in +++ kdebase-3.5.6/ksplashml/pics/themes/default/locolor/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/pics/themes/default/Makefile.in +++ kdebase-3.5.6/ksplashml/pics/themes/default/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -571,7 +580,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -609,9 +618,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/pics/themes/Makefile.in +++ kdebase-3.5.6/ksplashml/pics/themes/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -560,7 +569,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -598,9 +607,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/pics/themes/simple/Makefile.in +++ kdebase-3.5.6/ksplashml/pics/themes/simple/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/pics/themes/none/Makefile.in +++ kdebase-3.5.6/ksplashml/pics/themes/none/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/pics/themes/blue-bend/Makefile.in +++ kdebase-3.5.6/ksplashml/pics/themes/blue-bend/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/Makefile.in +++ kdebase-3.5.6/ksplashml/Makefile.in @@ -172,6 +172,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -315,6 +316,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -365,6 +369,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -372,12 +377,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -398,10 +400,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -410,6 +415,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -571,6 +577,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -578,10 +585,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -618,7 +627,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -656,9 +665,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksplashml/kcmksplash/pics/Makefile.in +++ kdebase-3.5.6/ksplashml/kcmksplash/pics/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -542,7 +551,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -580,9 +589,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/kcmksplash/Makefile.in +++ kdebase-3.5.6/ksplashml/kcmksplash/Makefile.in @@ -170,6 +170,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -313,6 +314,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -363,6 +367,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -370,12 +375,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -396,10 +398,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -408,6 +413,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -569,6 +575,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -576,10 +583,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -616,7 +625,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -654,9 +663,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksplashml/themeengine/default/Makefile.in +++ kdebase-3.5.6/ksplashml/themeengine/default/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksplashml/themeengine/standard/pics/Makefile.in +++ kdebase-3.5.6/ksplashml/themeengine/standard/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/themeengine/standard/Makefile.in +++ kdebase-3.5.6/ksplashml/themeengine/standard/Makefile.in @@ -181,6 +181,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -324,6 +325,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -374,6 +378,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -381,12 +386,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -407,10 +409,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -419,6 +424,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -580,6 +586,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -587,10 +594,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -632,7 +641,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -670,9 +679,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksplashml/themeengine/Makefile.in +++ kdebase-3.5.6/ksplashml/themeengine/Makefile.in @@ -174,6 +174,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -317,6 +318,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -367,6 +371,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -374,12 +379,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -400,10 +402,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -412,6 +417,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -573,6 +579,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -580,10 +587,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -621,7 +630,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -659,9 +668,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksplashml/themeengine/simple/Makefile.in +++ kdebase-3.5.6/ksplashml/themeengine/simple/Makefile.in @@ -142,6 +142,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -285,6 +286,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -335,6 +339,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -342,12 +347,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -368,10 +370,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -380,6 +385,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -541,6 +547,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -548,10 +555,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -581,7 +590,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -619,9 +628,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksplashml/themeengine/redmond/pics/Makefile.in +++ kdebase-3.5.6/ksplashml/themeengine/redmond/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksplashml/themeengine/redmond/Makefile.in +++ kdebase-3.5.6/ksplashml/themeengine/redmond/Makefile.in @@ -172,6 +172,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -315,6 +316,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -365,6 +369,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -372,12 +377,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -398,10 +400,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -410,6 +415,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -571,6 +577,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -578,10 +585,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -619,7 +628,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -657,9 +666,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/drkonqi/pics/Makefile.in +++ kdebase-3.5.6/drkonqi/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/drkonqi/presets/Makefile.in +++ kdebase-3.5.6/drkonqi/presets/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/drkonqi/Makefile.in +++ kdebase-3.5.6/drkonqi/Makefile.in @@ -171,6 +171,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -314,6 +315,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -364,6 +368,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -371,12 +376,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -397,10 +399,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -409,6 +414,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -570,6 +576,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -577,10 +584,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -622,7 +631,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -660,9 +669,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/drkonqi/debuggers/Makefile.in +++ kdebase-3.5.6/drkonqi/debuggers/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kubuntu_93_konq_doc_remove_go_window_menu.diff +++ kdebase-3.5.6/kubuntu_93_konq_doc_remove_go_window_menu.diff @@ -0,0 +1,257 @@ +diff -Nru kdebase-3.5.6.orig/doc/konqueror/basics.docbook kdebase-3.5.6/doc/konqueror/basics.docbook +--- kdebase-3.5.6.orig/doc/konqueror/basics.docbook 2005-09-10 03:25:19.000000000 -0500 ++++ kdebase-3.5.6/doc/konqueror/basics.docbook 2007-03-15 01:05:10.000000000 -0500 +@@ -124,10 +124,7 @@ + Bookmarks section of this document. + + The Window is the main area of &konqueror; and +-can show you the contents of a directory, web page, document or image. Using +-the Window menu you can +-split &konqueror;'s main window into one or more separate views, useful for +-drag and drop operations, or set it to contain two or more tabbed views. ++can show you the contents of a directory, web page, document or image. + + + The Status Bar runs across the bottom of the +diff -Nru kdebase-3.5.6.orig/doc/konqueror/commands.docbook kdebase-3.5.6/doc/konqueror/commands.docbook +--- kdebase-3.5.6.orig/doc/konqueror/commands.docbook 2005-09-10 03:25:19.000000000 -0500 ++++ kdebase-3.5.6/doc/konqueror/commands.docbook 2007-03-15 01:03:55.000000000 -0500 +@@ -678,108 +678,6 @@ + + + +- +-The <guimenu>Go</guimenu> Menu +- +- +- +- +- +- +-&Alt;Up Arrow +-Go +-Up +- +-Go up a level in the folder +-hierarchy. +- +- +- +- +- +-&Alt;Left Arrow +-Go +-Back +- +-Go back to the previous +-view. +- +- +- +- +- +-&Alt;Right Arrow +-Go +-Forward +- +-You can only go forward if you've just gone +-back. +- +- +- +- +- +-&Ctrl;Home +-Go +-Home URL +- +-Go to your home folder. +- +- +- +- +-Go +-Applications +- +-Open the folder holding your +-applications. +- +- +- +- +-Go +-Trash +- +-Open your Trash +-folder in a separate window. +- +- +- +- +-Go +-Templates +- +-Open the Templates folder in a separate +-window. +- +- +- +- +-Go +-Autostart +- +-Open your Autostart folder in a separate +-window. +- +- +- +- +-Go +-Most Often Visited +- +- +-Displays a submenu showing the &URL;s you visit most often. Selecting one +-of these will make &konqueror; open that &URL;. +- +- +- +- +- +- +- + + The <guimenu>Bookmarks</guimenu> Menu + +@@ -1006,129 +904,6 @@ + + + +- +-The <guimenu>Window</guimenu> Menu +- +- +- +- +- +- +-&Ctrl;&Shift;L +-Window +-Split View Left/Right +- +-Split View Left/Right. +- +- +- +- +- +-&Ctrl;&Shift;T +-Window +-Split View Top/Bottom +- +-Split View Top/Bottom. +- +- +- +- +- +-&Ctrl;&Shift;R +-Window +-Remove Active View +- +-Remove Active View. +- +- +- +- +- +-&Ctrl;&Shift;N +-Window +-New Tab +- +-Open a new, empty, tab page. +- +- +- +- +- +-&Ctrl;&Shift;D +-Window +-Duplicate Current Tab +- +-Open a duplicate tab page. +- +- +- +- +- +-&Ctrl;&Shift;B +-Window +-Detach Current Tab +- +-Show the current tab page in a new instance of +-&konqueror;. +- +- +- +- +- +-&Ctrl;W +-Window +-Close Current Tab +- +-Close the current tab page. +- +- +- +- +- +-&Ctrl;&Shift;Left +-Window +-Move Tab Left +- +-Move the current tab one place left in the list of tabs. +- +- +- +- +- +-&Ctrl;&Shift;Left +-Window +-Move Tab Right +- +-Move the current tab one place right in the list of tabs. +- +- +- +- +-Window +-Show Terminal Emulator +- +-Open a small text terminal view at the bottom of the +- main +-window. +- +- +- +- +- +-F9 +-Window +-Show Navigation Panel +- +-Toggles the display of the &konqueror; navigation panel. See +-. +- +- +- +- +- +- + + The <guimenu>Help</guimenu> Menu + --- kdebase-3.5.6.orig/konqueror/iconview/Makefile.in +++ kdebase-3.5.6/konqueror/iconview/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/kttsplugin/Makefile.in +++ kdebase-3.5.6/konqueror/kttsplugin/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -595,7 +604,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -633,9 +642,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/pics/actions/Makefile.in +++ kdebase-3.5.6/konqueror/pics/actions/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/pics/tiles/Makefile.in +++ kdebase-3.5.6/konqueror/pics/tiles/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -555,7 +564,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -593,9 +602,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/pics/Makefile.in +++ kdebase-3.5.6/konqueror/pics/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -559,7 +568,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -597,9 +606,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/pics/indicators/Makefile.in +++ kdebase-3.5.6/konqueror/pics/indicators/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -555,7 +564,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -593,9 +602,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/sidebar/web_module/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/web_module/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = $(kde_datadir)/konqsidebartng/websidebar include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -593,7 +602,6 @@ #plugin_DATA=websidebar.desktop pluginadddir = $(kde_datadir)/konqsidebartng/add pluginadd_DATA = webmodule_add.desktop -htmldir = $(kde_datadir)/konqsidebartng/websidebar html_DATA = websidebar.html #>- all: all-am #>+ 1 @@ -601,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -639,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/sidebar/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/Makefile.in @@ -195,6 +195,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -338,6 +339,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -388,6 +392,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -395,12 +400,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -421,10 +423,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -433,6 +438,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -594,6 +600,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -601,10 +608,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -668,7 +677,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -706,9 +715,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/sidebar/trees/dirtree_module/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/dirtree_module/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -595,7 +604,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -633,9 +642,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/sidebar/trees/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/Makefile.in @@ -174,6 +174,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -317,6 +318,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -367,6 +371,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -374,12 +379,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -400,10 +402,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -412,6 +417,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -573,6 +579,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -580,10 +587,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -624,7 +633,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -662,9 +671,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/sidebar/trees/bookmark_module/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/bookmark_module/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -593,7 +602,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -631,9 +640,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/sidebar/trees/history_module/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/history_module/Makefile.in @@ -166,6 +166,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -309,6 +310,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -359,6 +363,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -366,12 +371,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -392,10 +394,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -404,6 +409,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -565,6 +571,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -572,10 +579,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -620,7 +629,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -658,9 +667,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/sidebar/trees/init/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/init/Makefile.in @@ -140,6 +140,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -283,6 +284,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -333,6 +337,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -340,12 +345,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -366,10 +368,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -378,6 +383,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -539,6 +545,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -546,10 +553,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -587,7 +596,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -625,9 +634,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/sidebar/trees/init/services/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/init/services/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/sidebar/trees/init/remote/web/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/init/remote/web/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/sidebar/trees/init/remote/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/init/remote/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -570,7 +579,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -608,9 +617,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/sidebar/trees/init/remote/ftp/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/trees/init/remote/ftp/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/sidebar/test/Makefile.in +++ kdebase-3.5.6/konqueror/sidebar/test/Makefile.in @@ -168,6 +168,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -311,6 +312,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -361,6 +365,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -368,12 +373,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -394,10 +396,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -406,6 +411,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -567,6 +573,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -574,10 +581,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -626,7 +635,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -664,9 +673,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/keditbookmarks/Makefile.in +++ kdebase-3.5.6/konqueror/keditbookmarks/Makefile.in @@ -176,6 +176,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -319,6 +320,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -369,6 +373,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -376,12 +381,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -402,10 +404,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -414,6 +419,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -575,6 +581,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -582,10 +589,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -637,7 +646,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -675,9 +684,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/client/Makefile.in +++ kdebase-3.5.6/konqueror/client/Makefile.in @@ -173,6 +173,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -316,6 +317,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -366,6 +370,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -373,12 +378,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -399,10 +401,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -411,6 +416,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -572,6 +578,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -579,10 +586,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -629,7 +638,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -667,9 +676,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/Makefile.in +++ kdebase-3.5.6/konqueror/Makefile.in @@ -220,6 +220,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -363,6 +364,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -413,6 +417,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -420,12 +425,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -446,10 +448,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -458,6 +463,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -619,6 +625,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -626,10 +633,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -731,7 +740,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -769,9 +778,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/preloader/Makefile.in +++ kdebase-3.5.6/konqueror/preloader/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/remoteencodingplugin/Makefile.in +++ kdebase-3.5.6/konqueror/remoteencodingplugin/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -596,7 +605,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -634,9 +643,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/shellcmdplugin/Makefile.in +++ kdebase-3.5.6/konqueror/shellcmdplugin/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/quickprint/Makefile.in +++ kdebase-3.5.6/konqueror/quickprint/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -559,7 +568,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -597,9 +606,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konqueror/listview/Makefile.in +++ kdebase-3.5.6/konqueror/listview/Makefile.in @@ -163,6 +163,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -306,6 +307,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -356,6 +360,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -363,12 +368,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -389,10 +391,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -401,6 +406,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -562,6 +568,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -569,10 +576,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -625,7 +634,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -663,9 +672,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konqueror/about/Makefile.in +++ kdebase-3.5.6/konqueror/about/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -604,7 +613,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -642,9 +651,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/doc/faq/Makefile.in +++ kdebase-3.5.6/doc/faq/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/ksplashml/Makefile.in +++ kdebase-3.5.6/doc/ksplashml/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/visualdict/Makefile.in +++ kdebase-3.5.6/doc/visualdict/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/userguide/Makefile.in +++ kdebase-3.5.6/doc/userguide/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/konqueror/Makefile.in +++ kdebase-3.5.6/doc/konqueror/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kompmgr/Makefile.in +++ kdebase-3.5.6/doc/kompmgr/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kdm/Makefile.in +++ kdebase-3.5.6/doc/kdm/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kdcop/Makefile.in +++ kdebase-3.5.6/doc/kdcop/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kmenuedit/Makefile.in +++ kdebase-3.5.6/doc/kmenuedit/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kdeprint/Makefile.in +++ kdebase-3.5.6/doc/kdeprint/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kpager/Makefile.in +++ kdebase-3.5.6/doc/kpager/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kfind/Makefile.in +++ kdebase-3.5.6/doc/kfind/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/glossary/Makefile.in +++ kdebase-3.5.6/doc/glossary/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/Makefile.in +++ kdebase-3.5.6/doc/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -562,7 +571,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -600,9 +609,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/protocols/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/protocols/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/devices/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/devices/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/usb/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/usb/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/pci/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/pci/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/scsi/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/scsi/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -562,7 +571,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -600,9 +609,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/partitions/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/partitions/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/cdinfo/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/cdinfo/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/sound/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/sound/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/memory/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/memory/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/xserver/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/xserver/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/nics/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/nics/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/ioports/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/ioports/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/processor/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/processor/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/interrupts/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/interrupts/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/pcmcia/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/pcmcia/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/samba/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/samba/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/opengl/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/opengl/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kinfocenter/dma/Makefile.in +++ kdebase-3.5.6/doc/kinfocenter/dma/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/useragent/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/useragent/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/filetypes/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/filetypes/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/keyboard/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/keyboard/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/filemanager/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/filemanager/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmkonsole/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmkonsole/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/cache/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/cache/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/clock/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/clock/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/arts/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/arts/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/cookies/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/cookies/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/desktopbehavior/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/desktopbehavior/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kdm/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kdm/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/helpindex/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/helpindex/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/spellchecking/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/spellchecking/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/proxy/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/proxy/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/colors/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/colors/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmsmserver/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmsmserver/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/khtml/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/khtml/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/panel/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/panel/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/language/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/language/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmcss/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmcss/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kwindecoration/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kwindecoration/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/performance/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/performance/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -562,7 +571,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -600,9 +609,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/windowmanagement/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/windowmanagement/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/bell/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/bell/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmnotify/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmnotify/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmlaunch/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmlaunch/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/icons/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/icons/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/netpref/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/netpref/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/panelappearance/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/panelappearance/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmstyle/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmstyle/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/mouse/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/mouse/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/keys/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/keys/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/energy/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/energy/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmfontinst/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmfontinst/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmtaskbar/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmtaskbar/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/email/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/email/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/screensaver/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/screensaver/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/passwords/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/passwords/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/kcmaccess/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/kcmaccess/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/smb/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/smb/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/desktop/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/desktop/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/fonts/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/fonts/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/crypto/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/crypto/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/background/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/background/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kcontrol/ebrowsing/Makefile.in +++ kdebase-3.5.6/doc/kcontrol/ebrowsing/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/klipper/Makefile.in +++ kdebase-3.5.6/doc/klipper/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kdesu/Makefile.in +++ kdebase-3.5.6/doc/kdesu/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/quickstart/Makefile.in +++ kdebase-3.5.6/doc/quickstart/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/knetattach/Makefile.in +++ kdebase-3.5.6/doc/knetattach/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kicker/Makefile.in +++ kdebase-3.5.6/doc/kicker/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/ksysguard/Makefile.in +++ kdebase-3.5.6/doc/ksysguard/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kioslave/Makefile.in +++ kdebase-3.5.6/doc/kioslave/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/khelpcenter/Makefile.in +++ kdebase-3.5.6/doc/khelpcenter/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -562,7 +571,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -600,9 +609,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kwrite/Makefile.in +++ kdebase-3.5.6/doc/kwrite/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kappfinder/Makefile.in +++ kdebase-3.5.6/doc/kappfinder/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kxkb/Makefile.in +++ kdebase-3.5.6/doc/kxkb/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/konsole/Makefile.in +++ kdebase-3.5.6/doc/konsole/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kate/Makefile.in +++ kdebase-3.5.6/doc/kate/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/doc/kdebugdialog/Makefile.in +++ kdebase-3.5.6/doc/kdebugdialog/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdm/backend/Makefile.in +++ kdebase-3.5.6/kdm/backend/Makefile.in @@ -161,6 +161,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -304,6 +305,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -354,6 +358,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -361,12 +366,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -387,10 +389,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -399,6 +404,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -560,6 +566,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -567,10 +574,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -639,7 +648,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -677,9 +686,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdm/Makefile.in +++ kdebase-3.5.6/kdm/Makefile.in @@ -134,6 +134,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -277,6 +278,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -327,6 +331,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -334,12 +339,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -360,10 +362,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -372,6 +377,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -533,6 +539,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -540,10 +547,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -574,7 +583,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -612,9 +621,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdm/kfrontend/pics/Makefile.in +++ kdebase-3.5.6/kdm/kfrontend/pics/Makefile.in @@ -118,6 +118,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -261,6 +262,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -311,6 +315,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -318,12 +323,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -344,10 +346,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -356,6 +361,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -517,6 +523,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -524,10 +531,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdm/kfrontend/sessions/Makefile.in +++ kdebase-3.5.6/kdm/kfrontend/sessions/Makefile.in @@ -118,6 +118,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -261,6 +262,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -311,6 +315,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -318,12 +323,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -344,10 +346,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -356,6 +361,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -517,6 +523,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -524,10 +531,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -601,7 +610,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -639,9 +648,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh kde.desktop: $(top_builddir)/config.status $(srcdir)/kde.desktop.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --- kdebase-3.5.6.orig/kdm/kfrontend/Makefile.in +++ kdebase-3.5.6/kdm/kfrontend/Makefile.in @@ -202,6 +202,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -345,6 +346,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -395,6 +399,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -402,12 +407,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -428,10 +430,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -440,6 +445,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -601,6 +607,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -608,10 +615,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -633,7 +642,7 @@ xdg_menudir = @xdg_menudir@ # use 'make GENKDMCONF_FLAGS=... install' to override -GENKDMCONF_FLAGS = +GENKDMCONF_FLAGS = --no-old SUBDIRS = themer themes pics sessions AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \ -I$(top_srcdir)/kdmlib $(all_includes) @@ -688,7 +697,7 @@ .SUFFIXES: .SUFFIXES: .c .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -726,9 +735,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdm/kfrontend/themer/Makefile.in +++ kdebase-3.5.6/kdm/kfrontend/themer/Makefile.in @@ -146,6 +146,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -289,6 +290,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -339,6 +343,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -346,12 +351,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -372,10 +374,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -384,6 +389,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -545,6 +551,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -552,10 +559,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -596,7 +605,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -634,9 +643,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/kdm/kfrontend/themes/circles/Makefile.in +++ kdebase-3.5.6/kdm/kfrontend/themes/circles/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -562,7 +571,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -600,9 +609,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdm/kfrontend/themes/Makefile.in +++ kdebase-3.5.6/kdm/kfrontend/themes/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksmserver/Makefile.in +++ kdebase-3.5.6/ksmserver/Makefile.in @@ -86,6 +86,7 @@ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = #>- ksmserver_la_DEPENDENCIES = ../kdmlib/libdmctl.la \ +#>- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ #>- $(am__DEPENDENCIES_1) #>+ 1 ksmserver_la_DEPENDENCIES = libkdeinit_ksmserver.la @@ -106,7 +107,8 @@ #>+ 1 testsh_OBJECTS = test.$(OBJEXT) testsh_DEPENDENCIES = $(am__DEPENDENCIES_1) shutdowndlg.lo \ - ../kdmlib/libdmctl.la + ../kdmlib/libdmctl.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) updateSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(update_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -214,6 +216,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -357,6 +360,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -407,6 +413,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -414,12 +421,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -440,10 +444,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -452,6 +459,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -613,6 +621,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -620,10 +629,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -664,7 +675,7 @@ KSMServerInterface_skel.cpp server_skel.cpp ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module -#>- ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) +#>- ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) $(HAL_LIBS) $(DBUS_LIBS) #>+ 1 ksmserver_la_LIBADD = libkdeinit_ksmserver.la picsdir = $(kde_datadir)/ksmserver/pics @@ -681,7 +692,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -719,9 +730,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -1214,8 +1225,9 @@ #>+ 2 libkdeinit_ksmserver_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries) -#>+ 3 +#>+ 4 libkdeinit_ksmserver_la_DEPENDENCIES = ../kdmlib/libdmctl.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) #>+ 3 --- kdebase-3.5.6.orig/kdcop/Makefile.in +++ kdebase-3.5.6/kdcop/Makefile.in @@ -164,6 +164,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -307,6 +308,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -357,6 +361,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -364,12 +369,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -390,10 +392,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -402,6 +407,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -563,6 +569,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -570,10 +577,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -608,7 +617,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -646,9 +655,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdepasswd/Makefile.in +++ kdebase-3.5.6/kdepasswd/Makefile.in @@ -172,6 +172,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -315,6 +316,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -365,6 +369,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -372,12 +377,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -398,10 +400,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -410,6 +415,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -571,6 +577,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -578,10 +585,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -615,7 +624,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -653,9 +662,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdepasswd/kcm/pics/Makefile.in +++ kdebase-3.5.6/kdepasswd/kcm/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -560,7 +569,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -598,9 +607,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdepasswd/kcm/Makefile.in +++ kdebase-3.5.6/kdepasswd/kcm/Makefile.in @@ -170,6 +170,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -313,6 +314,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -363,6 +367,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -370,12 +375,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -396,10 +398,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -408,6 +413,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -569,6 +575,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -576,10 +583,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -622,7 +631,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -660,9 +669,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kmenuedit/Makefile.in +++ kdebase-3.5.6/kmenuedit/Makefile.in @@ -211,6 +211,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -354,6 +355,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -404,6 +408,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -411,12 +416,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -437,10 +439,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -449,6 +454,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -610,6 +616,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -617,10 +624,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -680,7 +689,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -718,9 +727,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kmenuedit/pixmaps/Makefile.in +++ kdebase-3.5.6/kmenuedit/pixmaps/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -545,7 +554,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -583,9 +592,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdeprint/kdeprint_part/Makefile.in +++ kdebase-3.5.6/kdeprint/kdeprint_part/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -607,7 +616,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -645,9 +654,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdeprint/descriptions/Makefile.in +++ kdebase-3.5.6/kdeprint/descriptions/Makefile.in @@ -136,6 +136,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -279,6 +280,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -329,6 +333,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -336,12 +341,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -362,10 +364,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -374,6 +379,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -535,6 +541,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -542,10 +549,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -576,7 +585,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -614,9 +623,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh sortthem$(EXEEXT): $(sortthem_OBJECTS) $(sortthem_DEPENDENCIES) @rm -f sortthem$(EXEEXT) @@ -840,7 +849,7 @@ ./sortthem < printers.cpp | perl -n -e "print \"// xgettext: no-c-format\n\".\$$_;" > printers.new && mv printers.new $(srcdir)/printers.cpp messages: - $(XGETTEXT) printers.cpp -o $(podir)/../kdelibs/ppdtranslations.pot + $(XGETTEXT) printers.cpp -o $(podir)/ppdtranslations.pot .PHONY: printers.cpp # Tell versions [3.59,3.63) of GNU make to not export all variables. --- kdebase-3.5.6.orig/kdeprint/kjobviewer/Makefile.in +++ kdebase-3.5.6/kdeprint/kjobviewer/Makefile.in @@ -171,6 +171,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -314,6 +315,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -364,6 +368,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -371,12 +376,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -397,10 +399,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -409,6 +414,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -570,6 +576,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -577,10 +584,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -625,7 +634,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -663,9 +672,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdeprint/Makefile.in +++ kdebase-3.5.6/kdeprint/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdeprint/kprinter/Makefile.in +++ kdebase-3.5.6/kdeprint/kprinter/Makefile.in @@ -165,6 +165,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -308,6 +309,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -358,6 +362,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -365,12 +370,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -391,10 +393,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -403,6 +408,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -564,6 +570,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -571,10 +578,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -615,7 +624,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -653,9 +662,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdeprint/slave/templates/Makefile.in +++ kdebase-3.5.6/kdeprint/slave/templates/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -582,7 +591,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -620,9 +629,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdeprint/slave/Makefile.in +++ kdebase-3.5.6/kdeprint/slave/Makefile.in @@ -167,6 +167,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -310,6 +311,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -360,6 +364,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -367,12 +372,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -393,10 +395,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -405,6 +410,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -566,6 +572,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -573,10 +580,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -615,7 +624,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -653,9 +662,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdeprint/slave/mimetypes/Makefile.in +++ kdebase-3.5.6/kdeprint/slave/mimetypes/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -555,7 +564,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -593,9 +602,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdeprint/printmgr/Makefile.in +++ kdebase-3.5.6/kdeprint/printmgr/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdeprint/kdeprintfax/Makefile.in +++ kdebase-3.5.6/kdeprint/kdeprintfax/Makefile.in @@ -165,6 +165,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -308,6 +309,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -358,6 +362,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -365,12 +370,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -391,10 +393,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -403,6 +408,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -564,6 +570,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -571,10 +578,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -615,7 +624,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -653,9 +662,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/libkonq/pics/Makefile.in +++ kdebase-3.5.6/libkonq/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/libkonq/favicons/Makefile.in +++ kdebase-3.5.6/libkonq/favicons/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -606,7 +615,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -644,9 +653,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/libkonq/Makefile.in +++ kdebase-3.5.6/libkonq/Makefile.in @@ -211,6 +211,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -354,6 +355,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -404,6 +408,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -411,12 +416,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -437,10 +439,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -449,6 +454,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -610,6 +616,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -617,10 +624,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -697,7 +706,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -735,9 +744,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/libkonq/tests/Makefile.in +++ kdebase-3.5.6/libkonq/tests/Makefile.in @@ -136,6 +136,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -279,6 +280,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -329,6 +333,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -336,12 +341,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -362,10 +364,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -374,6 +379,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -535,6 +541,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -542,10 +549,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -576,7 +585,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -614,9 +623,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-checkPROGRAMS: --- kdebase-3.5.6.orig/kpager/Makefile.in +++ kdebase-3.5.6/kpager/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -602,7 +611,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -640,9 +649,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/pics/Makefile.in +++ kdebase-3.5.6/pics/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/pics/wallpapers/Makefile.in +++ kdebase-3.5.6/pics/wallpapers/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/pics/crystalsvg/Makefile.in +++ kdebase-3.5.6/pics/crystalsvg/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -542,7 +551,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -580,9 +589,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kfind/pics/Makefile.in +++ kdebase-3.5.6/kfind/pics/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kfind/Makefile.in +++ kdebase-3.5.6/kfind/Makefile.in @@ -195,6 +195,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -338,6 +339,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -388,6 +392,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -395,12 +400,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -421,10 +423,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -433,6 +438,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -594,6 +600,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -601,10 +608,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -655,7 +664,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -693,9 +702,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/config.h.in +++ kdebase-3.5.6/config.h.in @@ -215,10 +215,14 @@ /* Define to 1 if you have the `login_getclass' function. */ #undef HAVE_LOGIN_GETCLASS -/* Define to 1 if long double works and has more range or precision than - double. */ +/* Define to 1 if the type `long double' works and has more range or precision + than `double'. */ #undef HAVE_LONG_DOUBLE +/* Define to 1 if the type `long double' works and has more range or precision + than `double'. */ +#undef HAVE_LONG_DOUBLE_WIDER + /* Define if you have long long as datatype */ #undef HAVE_LONG_LONG @@ -659,25 +663,25 @@ /* Define if kdm should use Sun's secure RPC for Xauth cookies. */ #undef SECURE_RPC -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The size of a `char *', as computed by sizeof. */ +/* The size of `char *', as computed by sizeof. */ #undef SIZEOF_CHAR_P -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of a `unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* Define to 1 if you have the ANSI C header files. */ --- kdebase-3.5.6.orig/kdmlib/Makefile.in +++ kdebase-3.5.6/kdmlib/Makefile.in @@ -163,6 +163,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -306,6 +307,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -356,6 +360,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -363,12 +368,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -389,10 +391,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -401,6 +406,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -562,6 +568,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -569,10 +576,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -619,7 +628,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -657,9 +666,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdialog/Makefile.in +++ kdebase-3.5.6/kdialog/Makefile.in @@ -146,6 +146,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -289,6 +290,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -339,6 +343,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -346,12 +351,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -372,10 +374,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -384,6 +389,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -545,6 +551,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -552,10 +559,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -589,7 +598,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -627,9 +636,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/configure +++ kdebase-3.5.6/configure @@ -1,25 +1,54 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.61. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -29,8 +58,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +108,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -63,157 +128,388 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +518,28 @@ as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,15 +548,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -278,15 +586,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -395,29 +703,26 @@ tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 &1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -430,42 +735,551 @@ # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE install_usbids_TRUE install_usbids_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS KHOTKEYS_ARTS_SUBDIR LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +target +target_cpu +target_vendor +target_os +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT +KDECONFIG +kde_libs_prefix +kde_libs_htmldir +CONF_FILES +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +CPP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +WOVERLOADED_VIRTUAL +HAVE_GCC_VISIBILITY +unsermake_enable_pch_TRUE +unsermake_enable_pch_FALSE +USE_EXCEPTIONS +USE_RTTI +CXXCPP +NOOPT_CXXFLAGS +NOOPT_CFLAGS +ENABLE_PERMISSIVE_FLAG +LDFLAGS_AS_NEEDED +LDFLAGS_NEW_DTAGS +KDE_USE_FINAL_TRUE +KDE_USE_FINAL_FALSE +KDE_USE_CLOSURE_TRUE +KDE_USE_CLOSURE_FALSE +KDE_NO_UNDEFINED +KDE_USE_NMCHECK_TRUE +KDE_USE_NMCHECK_FALSE +GREP +EGREP +LN_S +ECHO +AR +RANLIB +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +KDE_PLUGIN +KDE_CHECK_PLUGIN +MSGFMT +GMSGFMT +XGETTEXT +LIBUTIL +LIBCOMPAT +LIBCRYPT +LIBRESOLV +LIB_POLL +FRAMEWORK_COREAUDIO +LIBSOCKET +X_EXTRA_LIBS +LIBUCB +LIBDL +KDE_USE_FPIE +KDE_USE_PIE +include_x11_TRUE +include_x11_FALSE +XMKMF +X_PRE_LIBS +LIB_X11 +LIB_XRENDER +LIBSM +X_INCLUDES +X_LDFLAGS +x_includes +x_libraries +QTE_NORTTI +LIB_XEXT +LIBPTHREAD +USE_THREADS +KDE_MT_LDFLAGS +KDE_MT_LIBS +USER_INCLUDES +USER_LDFLAGS +LIBZ +LIBPNG +LIBJPEG +qt_libraries +qt_includes +QT_INCLUDES +QT_LDFLAGS +PERL +MOC +UIC +UIC_TR +LIB_QT +LIB_QPE +kde_qtver +KDE_EXTRA_RPATH +KDE_RPATH +X_RPATH +kde_libraries +kde_includes +KDE_LDFLAGS +KDE_INCLUDES +all_includes +all_libraries +AUTODIRS +include_ARTS_TRUE +include_ARTS_FALSE +MAKEKDEWIDGETS +KCONFIG_COMPILER +KCFG_DEPENDENCIES +DCOPIDLNG +DCOPIDL +DCOPIDL2CPP +DCOP_DEPENDENCIES +MCOPIDL +ARTSCCONFIG +MEINPROC +KDE_XSL_STYLESHEET +XMLLINT +kde_htmldir +kde_appsdir +kde_icondir +kde_sounddir +kde_datadir +kde_locale +kde_confdir +kde_kcfgdir +kde_mimedir +kde_wallpaperdir +kde_bindir +xdg_appsdir +xdg_menudir +xdg_directorydir +kde_templatesdir +kde_servicesdir +kde_servicetypesdir +kde_moduledir +kdeinitdir +kde_styledir +kde_widgetdir +LIB_KDED +LIB_KDECORE +LIB_KDEUI +LIB_KIO +LIB_KJS +LIB_SMB +LIB_KAB +LIB_KABC +LIB_KHTML +LIB_KSPELL +LIB_KPARTS +LIB_KDEPRINT +LIB_KUTILS +LIB_KDEPIM +LIB_KIMPROXY +LIB_KNEWSTUFF +LIB_KDNSSD +LIB_KUNITTEST +LIB_KSYCOCA +LIB_KFILE +LIB_KFM +PAMLIBS +LIBSHADOW +LIBGEN +SETUIDFLAGS +PASSWDLIBS +KDM_PAM_SERVICE +KCHECKPASS_PAM_SERVICE +KSCREENSAVER_PAM_SERVICE +LIBALIB +LIBRPC +LIBOSSAUDIO +LIBCFG +LIBODM +LIBCURSES +LIBKSTAT +LIBDEVINFO +JAVAC +JAVAH +JAR +JVMLIBS +jni_includes +MD5SUM +MD5SUM_CUT +XTESTLIB +LIB_XCURSOR +have_xcursor_TRUE +have_xcursor_FALSE +QTDOCDIR +KDE_HAVE_DOT +DOXYGEN +DOXYGEN_PROJECT_NAME +DOXYGEN_PROJECT_NUMBER +KDE_HAS_DOXYGEN +KDE_BINDIR +LIBART_LIBS +LIBART_CFLAGS +LIBART_RPATH +RUN_KAPPFINDER +include_kcontrol_access_TRUE +include_kcontrol_access_FALSE +include_kcontrol_accessibility_TRUE +include_kcontrol_accessibility_FALSE +SSL_INCLUDES +SSL_LDFLAGS +LIBSSL +DPMSINC +DPMSLIB +LIBFONTCONFIG_LIBS +LIBFONTCONFIG_CFLAGS +LIBFONTCONFIG_RPATH +LIB_TRU64_MACH +GLINC +GLLIB +COMPILE_GL_INFO_TRUE +COMPILE_GL_INFO_FALSE +LIBUSBCONFIG +USB_LIBS +USB_CFLAGS +include_kcontrol_joystick_TRUE +include_kcontrol_joystick_FALSE +LIBFREETYPE_LIBS +LIBFREETYPE_CFLAGS +LIBFREETYPE_RPATH +UNAME +LIB_FONT_ENC +LIBXFT_LIB +include_fontinst_tn_TRUE +include_fontinst_tn_FALSE +include_kcontrol_kfontinst_TRUE +include_kcontrol_kfontinst_FALSE +LIB_XRANDR +include_kcontrol_randr_TRUE +include_kcontrol_randr_FALSE +include_kcontrol_smartcard_TRUE +include_kcontrol_smartcard_FALSE +include_kcontrol_usbview_TRUE +include_kcontrol_usbview_FALSE +install_usbids_TRUE +install_usbids_FALSE +include_kcontrol_view1394_TRUE +include_kcontrol_view1394_FALSE +LIB_XSS +LIB_XF86MISC +nogroup +LIBXDMCP +KRB4_INCS +KRB4_LIBS +KRB4_RPATH +LIB_LIBS +LIBPOSIX4 +KRB5_INCS +KRB5_LIBS +KRB5_RPATH +LIB_ARTS +ARTS_CFLAGS +KHOTKEYS_ARTS_SUBDIR +LIB_KVM +LIB_XCOMPOSITE +LIB_XFIXES +SASL2_LIBS +LIBBZ2 +include_BZIP2_TRUE +include_BZIP2_FALSE +LIB_LBER +LDAP_INCS +LDAP_LIBS +LDAP_RPATH +include_kioslave_ldap_TRUE +include_kioslave_ldap_FALSE +LINUXCDPOLLING +PKG_CONFIG +HAL_CFLAGS +HAL_LIBS +HAL_INCS +DBUS_CFLAGS +DBUS_LIBS +DBUS_INCS +DBUSQT_INCS +DBUSQT_LIBS +HALBACKEND +include_media_linuxcdpolling_TRUE +include_media_linuxcdpolling_FALSE +include_media_halbackend_TRUE +include_media_halbackend_FALSE +SMBCLIENT_EXTRA_LIBS +include_kioslave_smb_TRUE +include_kioslave_smb_FALSE +LIB_EXR +EXR_FLAGS +include_EXR_MODULES_TRUE +include_EXR_MODULES_FALSE +LIBMALLOC +LIB_XINERAMA +include_ksysguardd_TRUE +include_ksysguardd_FALSE +include_ksysguardd_linux_TRUE +include_ksysguardd_linux_FALSE +include_ksysguardd_freebsd_TRUE +include_ksysguardd_freebsd_FALSE +include_ksysguardd_netbsd_TRUE +include_ksysguardd_netbsd_FALSE +include_ksysguardd_solaris_TRUE +include_ksysguardd_solaris_FALSE +include_ksysguardd_tru64_TRUE +include_ksysguardd_tru64_FALSE +include_ksysguardd_irix_TRUE +include_ksysguardd_irix_FALSE +include_ksysguardd_openbsd_TRUE +include_ksysguardd_openbsd_FALSE +LIBHOSTS +LIBSENSORS +supports_i8k_TRUE +supports_i8k_FALSE +LIB_DNSSD +HAVE_DNSSD_TRUE +HAVE_DNSSD_FALSE +include_kompmgr_TRUE +include_kompmgr_FALSE +TOPSUBDIRS +libkonq_SUBDIR_included_TRUE +libkonq_SUBDIR_included_FALSE +applnk_SUBDIR_included_TRUE +applnk_SUBDIR_included_FALSE +doc_SUBDIR_included_TRUE +doc_SUBDIR_included_FALSE +drkonqi_SUBDIR_included_TRUE +drkonqi_SUBDIR_included_FALSE +kappfinder_SUBDIR_included_TRUE +kappfinder_SUBDIR_included_FALSE +kate_SUBDIR_included_TRUE +kate_SUBDIR_included_FALSE +kcheckpass_SUBDIR_included_TRUE +kcheckpass_SUBDIR_included_FALSE +kcminit_SUBDIR_included_TRUE +kcminit_SUBDIR_included_FALSE +kdcop_SUBDIR_included_TRUE +kdcop_SUBDIR_included_FALSE +kdebugdialog_SUBDIR_included_TRUE +kdebugdialog_SUBDIR_included_FALSE +kdeeject_SUBDIR_included_TRUE +kdeeject_SUBDIR_included_FALSE +kdepasswd_SUBDIR_included_TRUE +kdepasswd_SUBDIR_included_FALSE +kdeprint_SUBDIR_included_TRUE +kdeprint_SUBDIR_included_FALSE +kdesu_SUBDIR_included_TRUE +kdesu_SUBDIR_included_FALSE +kdialog_SUBDIR_included_TRUE +kdialog_SUBDIR_included_FALSE +kdmlib_SUBDIR_included_TRUE +kdmlib_SUBDIR_included_FALSE +kfind_SUBDIR_included_TRUE +kfind_SUBDIR_included_FALSE +khelpcenter_SUBDIR_included_TRUE +khelpcenter_SUBDIR_included_FALSE +khotkeys_SUBDIR_included_TRUE +khotkeys_SUBDIR_included_FALSE +kioslave_SUBDIR_included_TRUE +kioslave_SUBDIR_included_FALSE +klipper_SUBDIR_included_TRUE +klipper_SUBDIR_included_FALSE +kmenuedit_SUBDIR_included_TRUE +kmenuedit_SUBDIR_included_FALSE +knetattach_SUBDIR_included_TRUE +knetattach_SUBDIR_included_FALSE +konsole_SUBDIR_included_TRUE +konsole_SUBDIR_included_FALSE +kpager_SUBDIR_included_TRUE +kpager_SUBDIR_included_FALSE +kpersonalizer_SUBDIR_included_TRUE +kpersonalizer_SUBDIR_included_FALSE +kreadconfig_SUBDIR_included_TRUE +kreadconfig_SUBDIR_included_FALSE +kscreensaver_SUBDIR_included_TRUE +kscreensaver_SUBDIR_included_FALSE +ksplashml_SUBDIR_included_TRUE +ksplashml_SUBDIR_included_FALSE +kstart_SUBDIR_included_TRUE +kstart_SUBDIR_included_FALSE +ksysguard_SUBDIR_included_TRUE +ksysguard_SUBDIR_included_FALSE +ksystraycmd_SUBDIR_included_TRUE +ksystraycmd_SUBDIR_included_FALSE +ktip_SUBDIR_included_TRUE +ktip_SUBDIR_included_FALSE +kwin_SUBDIR_included_TRUE +kwin_SUBDIR_included_FALSE +kxkb_SUBDIR_included_TRUE +kxkb_SUBDIR_included_FALSE +l10n_SUBDIR_included_TRUE +l10n_SUBDIR_included_FALSE +nsplugins_SUBDIR_included_TRUE +nsplugins_SUBDIR_included_FALSE +pics_SUBDIR_included_TRUE +pics_SUBDIR_included_FALSE +konqueror_SUBDIR_included_TRUE +konqueror_SUBDIR_included_FALSE +ksmserver_SUBDIR_included_TRUE +ksmserver_SUBDIR_included_FALSE +kicker_SUBDIR_included_TRUE +kicker_SUBDIR_included_FALSE +kcontrol_SUBDIR_included_TRUE +kcontrol_SUBDIR_included_FALSE +kdesktop_SUBDIR_included_TRUE +kdesktop_SUBDIR_included_FALSE +kdm_SUBDIR_included_TRUE +kdm_SUBDIR_included_FALSE +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS +XMKMF' + # Initialize some variables set by options. ac_init_help= @@ -492,34 +1306,48 @@ # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -541,33 +1369,45 @@ --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -594,6 +1434,12 @@ -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -618,13 +1464,16 @@ | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -689,6 +1538,16 @@ | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -741,24 +1600,20 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -789,8 +1644,7 @@ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -810,27 +1664,19 @@ { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -857,94 +1703,76 @@ test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -973,9 +1801,6 @@ -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -993,15 +1818,22 @@ --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1025,6 +1857,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --disable-fast-perl disable fast Makefile generation (needs perl) --enable-debug=ARG enables debug symbols (yes|no|full) default=no --disable-debug disables debug output and debug symbols default=no @@ -1042,10 +1876,8 @@ of memory) --enable-closure delay template instantiation --enable-nmcheck enable automatic namespace cleanness check - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=no] --enable-libsuffix /lib directory suffix (64,32,none,auto=default) --enable-fast-install[=PKGS] optimize for fast installation [default=yes] @@ -1071,8 +1903,7 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] --with-extra-includes=DIR adds non standard include paths --with-extra-libs=DIR adds non standard library paths @@ -1080,11 +1911,12 @@ --with-qt-includes=DIR where the Qt includes are. --with-qt-libraries=DIR where the Qt library is installed. --without-arts build without aRts default=no - --with-pam=ARG enable support for PAM: ARG=yes|no|service, name + --with-pam=ARG enable support for PAM: ARG=yes|no|service, name --with-shadow If you want shadow password support - --with-kdm-pam=val override PAM service from --with-pam for kdm - --with-kcp-pam=val override PAM service from --with-pam for kcheckpass - --with-kss-pam=val override PAM service from --with-pam for kscreensaver + --with-kdm-pam=val override PAM service from --with-pam for kdm + --with-kcp-pam=val override PAM service from --with-pam for kcheckpass + --with-kss-pam=val override PAM service from --with-pam for + kscreensaver --with-java=javadir use java installed in javadir, --without-java disables --without-composite Disable Xcomposite support (default: check) @@ -1120,131 +1952,101 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags + XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1263,7 +2065,7 @@ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1277,6 +2079,7 @@ test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1298,7 +2101,6 @@ ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1309,7 +2111,7 @@ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1331,9 +2133,7 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1344,8 +2144,8 @@ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1358,20 +2158,34 @@ _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1382,22 +2196,28 @@ echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1409,26 +2229,24 @@ ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1459,14 +2277,17 @@ # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1482,8 +2303,8 @@ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1495,12 +2316,11 @@ # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1525,8 +2345,7 @@ # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1543,12 +2362,6 @@ { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1565,110 +2378,165 @@ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= -for ac_dir in admin $srcdir/admin; do - if test -f $ac_dir/install-sh; then +for ac_dir in admin "$srcdir"/admin; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + unset CDPATH # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6; } if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_target_alias=$target_alias -test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 +echo "$as_me: error: invalid value of canonical target" >&2;} + { (exit 1); exit 1; }; };; +esac target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac # The aliases save the names the user supplied, while $host etc. @@ -1678,17 +2546,17 @@ NONENONEs,x,x, && program_prefix=${target_alias}- test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed am__api_version="1.9" @@ -1710,8 +2578,8 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1733,7 +2601,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1752,21 +2620,22 @@ ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1780,8 +2649,8 @@ if test -z "$kde_save_INSTALL_given" ; then # OK, user hasn't given any INSTALL, autoconf found one for us # now we test, if it supports the -p flag - echo "$as_me:$LINENO: checking for -p flag to install" >&5 -echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for -p flag to install" >&5 +echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; } rm -f confinst.$$.* > /dev/null 2>&1 echo "Testtest" > confinst.$$.orig ac_res=no @@ -1793,8 +2662,8 @@ fi fi rm -f confinst.$$.* - echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6 + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test -z "$kde_save_INSTALL_PROGRAM_given" ; then @@ -1804,8 +2673,8 @@ INSTALL_SCRIPT='${INSTALL}' fi -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1847,8 +2716,8 @@ Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1899,8 +2768,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1913,54 +2782,57 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2031,8 +2903,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2045,32 +2917,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2083,27 +2957,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -2123,6 +3011,31 @@ +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + unset CDPATH @@ -2141,14 +3054,14 @@ if test "x$prefix" = "xNONE"; then - echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kde-config" >&5 +echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2191,8 +3104,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program kde-config was not found! Please check whether you installed KDE correctly. @@ -2203,8 +3116,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } KDECONFIG=$kde_cv_path fi @@ -2213,14 +3126,14 @@ kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kde-config" >&5 +echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2263,8 +3176,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program kde-config was not found! Please check whether you installed KDE correctly. @@ -2275,8 +3188,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } KDECONFIG=$kde_cv_path fi @@ -2298,16 +3211,16 @@ fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - echo "$as_me:$LINENO: checking where to install" >&5 -echo $ECHO_N "checking where to install... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking where to install" >&5 +echo $ECHO_N "checking where to install... $ECHO_C" >&6; } if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 -echo "${ECHO_T}$prefix (as returned by kde-config)" >&6 + { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 +echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; } else given_prefix=$prefix - echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 -echo "${ECHO_T}$prefix (as requested)" >&6 + { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 +echo "${ECHO_T}$prefix (as requested)" >&6; } fi # And delete superfluous '/' to make compares easier @@ -2320,13 +3233,13 @@ - # Check whether --enable-fast-perl or --disable-fast-perl was given. + # Check whether --enable-fast-perl was given. if test "${enable_fast_perl+set}" = set; then - enableval="$enable_fast_perl" - with_fast_perl=$enableval + enableval=$enable_fast_perl; with_fast_perl=$enableval else with_fast_perl=yes -fi; +fi + val= @@ -2343,11 +3256,11 @@ - ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers config.h" DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -2357,8 +3270,8 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -2385,15 +3298,15 @@ fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -2413,10 +3326,9 @@ - # Check whether --enable-debug or --disable-debug was given. + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - + enableval=$enable_debug; case $enableval in yes) kde_use_debug_code="yes" @@ -2436,18 +3348,18 @@ kde_use_debug_code="no" kde_use_debug_define=no -fi; +fi + - # Check whether --enable-dummyoption or --disable-dummyoption was given. + # Check whether --enable-dummyoption was given. if test "${enable_dummyoption+set}" = set; then - enableval="$enable_dummyoption" + enableval=$enable_dummyoption; +fi -fi; - # Check whether --enable-strict or --disable-strict was given. + # Check whether --enable-strict was given. if test "${enable_strict+set}" = set; then - enableval="$enable_strict" - + enableval=$enable_strict; if test $enableval = "no"; then kde_use_strict_options="no" else @@ -2456,12 +3368,12 @@ else kde_use_strict_options="no" -fi; +fi - # Check whether --enable-warnings or --disable-warnings was given. -if test "${enable_warnings+set}" = set; then - enableval="$enable_warnings" + # Check whether --enable-warnings was given. +if test "${enable_warnings+set}" = set; then + enableval=$enable_warnings; if test $enableval = "no"; then kde_use_warnings="no" else @@ -2470,20 +3382,21 @@ else kde_use_warnings="yes" -fi; +fi + if test "$kde_use_debug_code" != "no"; then kde_use_warnings=yes fi - # Check whether --enable-profile or --disable-profile was given. + # Check whether --enable-profile was given. if test "${enable_profile+set}" = set; then - enableval="$enable_profile" - kde_use_profiling=$enableval + enableval=$enable_profile; kde_use_profiling=$enableval else kde_use_profiling="no" -fi; +fi + CFLAGS=" $CFLAGS" @@ -2495,8 +3408,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2509,32 +3422,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2547,36 +3462,51 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2589,74 +3519,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2670,7 +3560,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2681,6 +3571,7 @@ fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2698,22 +3589,23 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2726,36 +3618,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2768,29 +3662,45 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -2803,21 +3713,35 @@ { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2842,47 +3766,77 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2894,19 +3848,21 @@ fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2925,22 +3881,27 @@ fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2951,9 +3912,8 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2967,14 +3927,14 @@ fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2994,14 +3954,20 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -3019,12 +3985,12 @@ rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3047,50 +4013,49 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3106,38 +4071,118 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3153,12 +4198,12 @@ CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3192,12 +4237,17 @@ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -3212,205 +4262,57 @@ return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3419,8 +4321,8 @@ depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3509,8 +4411,8 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3532,8 +4434,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3567,24 +4469,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3593,9 +4493,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3605,24 +4506,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3633,6 +4532,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3650,8 +4550,8 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3674,24 +4574,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3700,9 +4598,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3712,24 +4611,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3740,6 +4637,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3790,18 +4688,22 @@ CXXFLAGS=" $CXXFLAGS" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3814,36 +4716,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3856,55 +4760,85 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3927,50 +4861,49 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3986,159 +4919,133 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4147,8 +5054,8 @@ depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4237,8 +5144,8 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -4256,8 +5163,8 @@ - echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 -echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 +echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -4282,39 +5189,35 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_bad_compiler=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_bad_compiler=yes + kde_bad_compiler=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 -echo "${ECHO_T}$kde_bad_compiler" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 +echo "${ECHO_T}$kde_bad_compiler" >&6; } if test "$kde_bad_compiler" = "yes"; then { { echo "$as_me:$LINENO: error: @@ -4356,17 +5259,16 @@ fi fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; } kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4394,34 +5296,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4434,29 +5334,28 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="-fno-builtin $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5 -echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5 +echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; } kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4483,34 +5382,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4523,13 +5420,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : WOVERLOADED_VIRTUAL="-Woverloaded-virtual" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : WOVERLOADED_VRITUAL="" fi @@ -4550,16 +5447,15 @@ if test "$kde_use_profiling" = "yes"; then -echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5 -echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5 +echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; } kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4586,34 +5482,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4626,16 +5520,16 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CFLAGS="-pg $CFLAGS" CXXFLAGS="-pg $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -4650,16 +5544,15 @@ CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" -echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5 -echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5 +echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; } kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4686,34 +5579,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4726,27 +5617,26 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5 -echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5 +echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; } kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4771,34 +5661,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cc_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$save_CFLAGS" ac_ext=c @@ -4811,13 +5699,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -4825,16 +5713,15 @@ ;; esac -echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5 -echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5 +echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; } kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4861,34 +5748,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4901,28 +5786,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="-Wundef $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5 -echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5 +echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; } kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4949,34 +5833,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4989,28 +5871,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="-Wno-long-long $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5 -echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5 +echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; } kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5037,34 +5918,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5077,13 +5956,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -5095,13 +5974,13 @@ CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" fi - # Check whether --enable-pch or --disable-pch was given. + # Check whether --enable-pch was given. if test "${enable_pch+set}" = set; then - enableval="$enable_pch" - kde_use_pch=$enableval + enableval=$enable_pch; kde_use_pch=$enableval else kde_use_pch=no -fi; +fi + HAVE_GCC_VISIBILITY=0 @@ -5109,16 +5988,15 @@ if test "$GXX" = "yes"; then gcc_no_reorder_blocks=NO -echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; } kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5145,34 +6023,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5185,13 +6061,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : gcc_no_reorder_blocks=YES else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -5203,16 +6079,15 @@ CFLAGS="$CFLAGS -fno-reorder-blocks" fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; } kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5239,34 +6114,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5279,28 +6152,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -fno-exceptions" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; } kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5327,34 +6199,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5367,28 +6237,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -fno-check-new" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; } kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5415,34 +6284,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5455,28 +6322,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -fno-common" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5 -echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5 +echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; } kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5503,34 +6369,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5543,13 +6407,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : USE_EXCEPTIONS="-fexceptions" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : USE_EXCEPTIONS= fi @@ -5557,37 +6421,37 @@ ENABLE_PERMISSIVE_FLAG="-fpermissive" if test "$kde_use_pch" = "yes"; then - echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5 -echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5 +echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; } echo >conftest.h if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then kde_gcc_supports_pch=yes - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else kde_gcc_supports_pch=no - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$kde_gcc_supports_pch" = "yes"; then - echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5 -echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5 +echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; } if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then kde_gcc_supports_pch=yes - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else kde_gcc_supports_pch=no - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi rm -f conftest.h conftest.h.gch fi - echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5 -echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5 +echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; } if test "${kde_cv_opt_noinline_match+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5619,44 +6483,41 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_opt_noinline_match=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_opt_noinline_match=no + kde_cv_opt_noinline_match=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_cflags_save" fi fi -echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5 -echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5 +echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; } if test "x$kde_cv_opt_noinline_match" = "xno" ; then CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" @@ -5676,16 +6537,15 @@ if test "$kde_use_pch" = "yes"; then -echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5 -echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5 +echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; } kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5712,34 +6572,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5752,29 +6610,28 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --pch" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; } kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5801,34 +6658,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5841,28 +6696,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; } kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5889,34 +6743,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5929,28 +6781,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; } kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5977,34 +6828,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6017,28 +6866,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; } kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6065,34 +6913,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6105,28 +6951,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5 -echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5 +echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; } kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6153,34 +6998,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6193,13 +7036,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --one_per" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -6306,13 +7149,13 @@ fi - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6342,24 +7185,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6368,9 +7209,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6380,24 +7222,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6408,6 +7248,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6425,8 +7266,8 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -6449,24 +7290,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6475,9 +7314,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6487,24 +7327,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6515,6 +7353,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6541,16 +7380,15 @@ NOOPT_CFLAGS=-O0 fi -echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5 -echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5 +echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; } kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6577,34 +7415,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6617,22 +7453,21 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : NOOPT_CXXFLAGS=-O0 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi - # Check whether --enable-coverage or --disable-coverage was given. + # Check whether --enable-coverage was given. if test "${enable_coverage+set}" = set; then - enableval="$enable_coverage" - + enableval=$enable_coverage; if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then ac_coverage_compiler="-fprofile-arcs -ftest-coverage" ac_coverage_linker="-lgcc" @@ -6648,36 +7483,36 @@ CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" LDFLAGS="$LDFLAGS $ac_coverage_linker" -fi; +fi + - # Check whether --enable-new_ldflags or --disable-new_ldflags was given. + # Check whether --enable-new_ldflags was given. if test "${enable_new_ldflags+set}" = set; then - enableval="$enable_new_ldflags" - kde_use_new_ldflags=$enableval + enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval else kde_use_new_ldflags=no -fi; +fi + LDFLAGS_AS_NEEDED="" LDFLAGS_NEW_DTAGS="" if test "x$kde_use_new_ldflags" = "xyes"; then LDFLAGS_NEW_DTAGS="" -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5 +echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; } kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6704,34 +7539,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6744,29 +7577,28 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5 +echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; } kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6793,34 +7625,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6833,13 +7663,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : LDFLAGS_AS_NEEDED="-Wl,--as-needed" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -6849,13 +7679,13 @@ - # Check whether --enable-final or --disable-final was given. + # Check whether --enable-final was given. if test "${enable_final+set}" = set; then - enableval="$enable_final" - kde_use_final=$enableval + enableval=$enable_final; kde_use_final=$enableval else kde_use_final=no -fi; +fi + if test "x$kde_use_final" = "xyes"; then KDE_USE_FINAL_TRUE="" @@ -6868,13 +7698,13 @@ - # Check whether --enable-closure or --disable-closure was given. + # Check whether --enable-closure was given. if test "${enable_closure+set}" = set; then - enableval="$enable_closure" - kde_use_closure=$enableval + enableval=$enable_closure; kde_use_closure=$enableval else kde_use_closure=no -fi; +fi + KDE_NO_UNDEFINED="" if test "x$kde_use_closure" = "xyes"; then @@ -6885,198 +7715,19 @@ KDE_USE_CLOSURE_TRUE="#" KDE_USE_CLOSURE_FALSE="" KDE_NO_UNDEFINED="" - case $host in - *-*-linux-gnu) - -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6 -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Wl,--no-undefined" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "kde_cv_prog_cxx_$kde_cache=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi - -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - : - -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6 -kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "kde_cv_prog_cxx_$kde_cache=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi - -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - : - KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined" -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - : - KDE_NO_UNDEFINED="" -fi - -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - : - KDE_NO_UNDEFINED="" -fi - - ;; - esac fi - # Check whether --enable-nmcheck or --disable-nmcheck was given. + # Check whether --enable-nmcheck was given. if test "${enable_nmcheck+set}" = set; then - enableval="$enable_nmcheck" - kde_use_nmcheck=$enableval + enableval=$enable_nmcheck; kde_use_nmcheck=$enableval else kde_use_nmcheck=no -fi; +fi + if test "$kde_use_nmcheck" = "yes"; then KDE_USE_NMCHECK_TRUE="" @@ -7091,10 +7742,9 @@ -# Check whether --enable-shared or --disable-shared was given. +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -7113,12 +7763,12 @@ esac else enable_shared=yes -fi; +fi -# Check whether --enable-static or --disable-static was given. + +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -7137,18 +7787,19 @@ esac else enable_static=no -fi; +fi - # Check whether --enable-libsuffix or --disable-libsuffix was given. + + # Check whether --enable-libsuffix was given. if test "${enable_libsuffix+set}" = set; then - enableval="$enable_libsuffix" - kdelibsuff=$enableval + enableval=$enable_libsuffix; kdelibsuff=$enableval else kdelibsuff="auto" -fi; +fi + if test "$kdelibsuff" = "auto"; then @@ -7169,8 +7820,8 @@ kdelibsuff= fi if test -z "$kdelibsuff"; then - echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 -echo "${ECHO_T}not using lib directory suffix" >&6 + { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 +echo "${ECHO_T}not using lib directory suffix" >&6; } cat >>confdefs.h <<\_ACEOF #define KDELIBSUFF "" @@ -7186,14 +7837,13 @@ #define KDELIBSUFF "${kdelibsuff}" _ACEOF - echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 -echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6 + { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 +echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; } fi -# Check whether --enable-fast-install or --disable-fast-install was given. +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -7212,10 +7862,11 @@ esac else enable_fast_install=yes -fi; +fi -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7239,7 +7890,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7268,37 +7919,184 @@ fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } + +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -7327,11 +8125,11 @@ ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7344,7 +8142,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7418,56 +8225,63 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7494,44 +8308,36 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi4*) +bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; cygwin*) - lt_cv_deplibs_check_method=pass_all + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' ;; mingw* | pw32*) - # win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='win32_libid' + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -7547,7 +8353,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -7563,43 +8369,27 @@ esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" - ;; + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. -linux*) - case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - # the debian people say, arm and glibc 2.3.1 works for them with pass_all - arm* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -7618,32 +8408,22 @@ ;; openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' fi ;; osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) lt_cv_deplibs_check_method=pass_all ;; solaris*) lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' @@ -7664,17 +8444,20 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -7683,14 +8466,17 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -7717,7 +8503,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7720 "configure"' > conftest.$ac_ext + echo '#line 8506 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7760,14 +8546,13 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) - LINUX_64_MODE="32" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7779,7 +8564,6 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" @@ -7804,8 +8588,8 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7831,35 +8615,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7868,13 +8649,33 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + esac @@ -7882,8 +8683,8 @@ -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7907,35 +8708,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -7991,6 +8788,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -8010,18 +8808,27 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8034,12 +8841,14 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -8062,9 +8871,9 @@ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8078,38 +8887,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -8124,18 +8930,19 @@ for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8146,41 +8953,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8189,24 +8992,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -8214,9 +9015,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -8240,25 +9042,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -8270,176 +9066,437 @@ done -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - test -n "$F77" && break - done -fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_F77" && break -done - - F77=$ac_ct_F77 -fi - - -# Provide some information about the compiler. -echo "$as_me:8365:" \ - "checking for Fortran 77 compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 -if test "${ac_cv_f77_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include #endif - - end + Syntax error _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +fi + +ac_ext=f +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_f77_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$F77"; then + ac_cv_prog_F77="$F77" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +F77=$ac_cv_prog_F77 +if test -n "$F77"; then + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$F77" && break + done +fi +if test -z "$F77"; then + ac_ct_F77=$F77 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_F77"; then + ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_F77=$ac_cv_prog_ac_ct_F77 +if test -n "$ac_ct_F77"; then + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ac_ct_F77" && break +done + + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi +fi + + +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +rm -f a.out + +# If we don't use `.F' as extension, the preprocessor is not run on the +# input file. (Note that this only needs to work for GNU compilers.) +ac_save_ext=$ac_ext +ac_ext=F +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } +if test "${ac_cv_f77_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF + program main +#ifndef __GNUC__ + choke me +#endif + + end +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8450,39 +9507,35 @@ end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -8511,13 +9564,13 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else i=0 - testring="ABCD" + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -8546,20 +9599,70 @@ lt_cv_sys_max_cmd_len=8192; ;; - *) + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` - testring=$testring$testring + teststring=$teststring$teststring done - testring= + teststring= # Add a significant safety factor because C++ compilers can tack on massive # amounts of additional arguments before passing them to the linker. # It appears as though 1/2 is a usable value. @@ -8570,19 +9673,19 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8596,9 +9699,6 @@ # Regexp to match symbols that can be accessed directly from C. sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -8620,14 +9720,30 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 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'" ;; +linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + 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'" + fi + ;; irix* | nonstopux*) symcode='[BCDEGRST]' ;; osf*) symcode='[BCDEGQRST]' ;; -solaris* | sysv5*) - symcode='[BDT]' +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' ;; sysv4) symcode='[DFNSTU]' @@ -8645,14 +9761,17 @@ # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[ABCDGISTW]' ;; + symcode='[ABCDGIRSTW]' ;; esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -8770,15 +9889,15 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8792,8 +9911,8 @@ fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -8814,7 +9933,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' # Same as above, but do not quote variable references. @@ -8834,7 +9953,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -8844,8 +9963,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8858,32 +9977,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8896,27 +10017,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -8924,8 +10059,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8938,32 +10073,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8976,27 +10113,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -9004,8 +10155,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9018,32 +10169,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9056,27 +10209,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -9091,6 +10258,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -9110,21 +10278,32 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9144,7 +10323,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -9176,17 +10355,17 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9206,7 +10385,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -9238,11 +10417,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -9257,21 +10436,21 @@ enable_dlopen=yes enable_win32_dll=no -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -9301,68 +10480,25 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC -# -# Check for any special shared library compilation flags. -# -lt_prog_cc_shlib= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - lt_prog_cc_shlib='-belf' - ;; - esac -fi -if test -n "$lt_prog_cc_shlib"; then - { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 -echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} - if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : - else - { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} - lt_cv_prog_cc_can_build_shared=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 -if test "${lt_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_prog_compiler_static" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - else - lt_prog_compiler_static_works=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 - -if test x"$lt_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* ## CAVEAT EMPTOR: @@ -9376,8 +10512,8 @@ lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9391,26 +10527,28 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9397: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10533: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9401: \$? = $ac_status" >&5 + echo "$as_me:10537: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -9424,8 +10562,8 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -9463,6 +10601,11 @@ lt_prog_compiler_pic='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -9479,7 +10622,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -9505,6 +10648,16 @@ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic='-qnocommon' + lt_prog_compiler_wl='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -9516,7 +10669,7 @@ lt_prog_compiler_wl='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -9539,13 +10692,20 @@ lt_prog_compiler_static='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. @@ -9560,15 +10720,15 @@ lt_prog_compiler_static='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic='-Kpic' - lt_prog_compiler_static='-dn' - ;; - solaris*) - lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac ;; sunos4*) @@ -9577,7 +10737,7 @@ lt_prog_compiler_static='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -9590,6 +10750,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + uts4*) lt_prog_compiler_pic='-pic' lt_prog_compiler_static='-Bstatic' @@ -9601,16 +10772,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9624,26 +10795,28 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9630: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10801: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9634: \$? = $ac_status" >&5 + echo "$as_me:10805: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -9656,7 +10829,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= @@ -9666,8 +10839,50 @@ ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works=yes + fi + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } + +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9678,60 +10893,58 @@ mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9697: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10905: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9701: \$? = $ac_status" >&5 + echo "$as_me:10909: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -9741,8 +10954,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -9780,6 +10993,16 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -9790,6 +11013,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -9800,6 +11027,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -9837,7 +11085,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9847,13 +11095,13 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=no + allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -9862,23 +11110,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + interix3*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + 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' + ;; + + linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + link_all_deplibs=no else ld_shlibs=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <&2 @@ -9892,13 +11187,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -9908,24 +11230,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -9937,7 +11254,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9959,9 +11276,21 @@ else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -9978,7 +11307,7 @@ link_all_deplibs=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -9997,8 +11326,12 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -10006,22 +11339,23 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - always_export_symbols=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10037,27 +11371,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -10068,19 +11398,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -10099,27 +11430,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -10130,8 +11457,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10140,13 +11469,11 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec=' ' + whole_archive_flag_spec='$convenience' archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -10159,7 +11486,7 @@ ld_shlibs=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec=-rdynamic ;; @@ -10169,13 +11496,13 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec=' ' - allow_undefined_flag=no + allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds='true' # FIXME: Should let the user specify the lib program. @@ -10185,52 +11512,52 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - archive_cmds_need_lc=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='-all_load $convenience' + whole_archive_flag_spec='' link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' else - ld_shlibs=no + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' + ;; + *) + ld_shlibs=no + ;; + esac fi ;; @@ -10264,8 +11591,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -10273,7 +11600,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -10287,47 +11614,62 @@ export_dynamic_flag_spec='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: hardcode_direct=no hardcode_shlibpath_var=no ;; - ia64*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=no - hardcode_shlibpath_var=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; *) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: hardcode_direct=yes export_dynamic_flag_spec='${wl}-E' @@ -10341,7 +11683,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -10351,7 +11693,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10374,7 +11716,8 @@ hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -10384,7 +11727,7 @@ hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -10395,14 +11738,14 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' @@ -10414,13 +11757,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10428,21 +11771,15 @@ hardcode_libdir_separator=: ;; - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag=' -z text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -10451,8 +11788,18 @@ hardcode_shlibpath_var=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac link_all_deplibs=yes ;; @@ -10461,7 +11808,7 @@ if test "x$host_vendor" = xsequent; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -10509,36 +11856,45 @@ fi ;; - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no ;; - sysv5*) - no_undefined_flag=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -10553,15 +11909,10 @@ esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -10579,8 +11930,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -10594,6 +11945,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -10616,20 +11968,20 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10639,7 +11991,20 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -10704,7 +12069,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -10713,7 +12078,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10729,7 +12094,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -10741,7 +12106,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -10771,7 +12137,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -10794,7 +12160,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -10817,20 +12183,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -10848,14 +12211,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -10875,9 +12243,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -10892,7 +12260,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -10903,7 +12271,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -10915,6 +12283,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -10958,29 +12338,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -10990,6 +12367,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -10999,7 +12388,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -11027,8 +12416,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -11048,7 +12442,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -11066,13 +12460,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -11098,7 +12485,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11131,6 +12518,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11142,16 +12552,21 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then + test -n "$runpath_var" || \ + test "X$hardcode_automatic" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct" != no && @@ -11171,8 +12586,8 @@ # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -11185,29 +12600,29 @@ striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -11239,8 +12654,8 @@ darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11253,56 +12668,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -11316,8 +12728,8 @@ ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11344,73 +12756,64 @@ #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11423,61 +12826,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11504,73 +12904,64 @@ #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11583,61 +12974,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11650,61 +13038,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11717,56 +13102,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -11801,13 +13183,13 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11817,7 +13199,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; esac else : # compilation failed @@ -11899,13 +13283,13 @@ fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11915,7 +13299,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; esac else : # compilation failed @@ -11997,8 +13383,8 @@ fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -12019,19 +13405,19 @@ fi -# Report which librarie types wil actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +# Report which library types will actually be built +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -12040,58 +13426,21 @@ fi ;; -aix4*) +aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi - ;; - darwin* | rhapsody*) - if test "$GCC" = yes; then - archive_cmds_need_lc=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='-all_load $convenience' - link_all_deplibs=yes - else - ld_shlibs=no - fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -12106,7 +13455,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -12220,11 +13570,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" +Xsed="$SED -e 1s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # The names of the tagged configurations supported by this script. available_tags= @@ -12254,6 +13604,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -12265,6 +13621,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler @@ -12284,7 +13643,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -12315,7 +13674,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -12330,7 +13689,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -12557,7 +13916,10 @@ # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -12570,11 +13932,11 @@ CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -12592,6 +13954,9 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -12622,8 +13987,10 @@ case $tagname in CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then - ac_ext=cc + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -12642,6 +14009,7 @@ hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported hardcode_automatic_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -12659,7 +14027,7 @@ compiler_lib_search_path_CXX= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o @@ -12669,17 +14037,34 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -12690,18 +14075,27 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC compiler_CXX=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -12715,18 +14109,18 @@ # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -12755,11 +14149,11 @@ ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12772,7 +14166,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -12825,8 +14219,8 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -12852,7 +14246,7 @@ # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists @@ -12867,8 +14261,8 @@ fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -12883,8 +14277,23 @@ exp_sym_flag='-Bexport' no_entry_flag="" else - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -12901,7 +14310,7 @@ link_all_deplibs_CXX=yes if test "$GXX" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -12920,8 +14329,12 @@ hardcode_libdir_flag_spec_CXX='-L$libdir' hardcode_libdir_separator_CXX= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -12930,15 +14343,16 @@ shared_flag='-G' else if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' + shared_flag='${wl}-bM:SRE' fi fi fi - # Let the compiler handle the export list. - always_export_symbols_CXX=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_CXX=yes if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. @@ -12960,27 +14374,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -12991,20 +14401,21 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -13023,27 +14434,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -13054,8 +14461,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -13064,16 +14473,26 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_CXX=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX=' ' + whole_archive_flag_spec_CXX='$convenience' archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + chorus*) case $cc_basename in *) @@ -13087,12 +14506,12 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=no + allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -13101,70 +14520,81 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs_CXX=no fi ;; + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes - darwin* | rhapsody*) - if test "$GXX" = yes; then - archive_cmds_need_lc_CXX=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac + if test "$GXX" = yes ; then + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes fi - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - 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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='-all_load $convenience' - link_all_deplibs_CXX=yes - else - ld_shlibs_CXX=no - fi - ;; + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + 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}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' + ;; + *) + ld_shlibs_CXX=no + ;; + esac + fi + ;; dgux*) case $cc_basename in - ec++) + ec++*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - ghcx) + ghcx*) # Green Hills C++ Compiler # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13175,14 +14605,14 @@ ;; esac ;; - freebsd12*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before switch to ELF ld_shlibs_CXX=no ;; freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -13199,12 +14629,12 @@ # location of the library. case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + aCC*) + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13213,11 +14643,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13227,33 +14657,22 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - hardcode_libdir_separator_CXX=: - ;; - ia64*) - hardcode_libdir_flag_spec_CXX='-L$libdir' ;; *) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: export_dynamic_flag_spec_CXX='${wl}-E' ;; esac fi - case "$host_cpu" in - hppa*64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - ia64*) + case $host_cpu in + hppa*64*|ia64*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. ;; *) hardcode_direct_CXX=yes @@ -13264,17 +14683,20 @@ esac case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -13290,12 +14712,15 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13306,11 +14731,25 @@ ;; esac ;; + interix3*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='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' + ;; irix5* | irix6*) case $cc_basename in - CC) + CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13321,9 +14760,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -13332,16 +14771,16 @@ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -13359,20 +14798,44 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc) + icpc*) # Intel C++ with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac archive_cmds_need_lc_CXX=no - archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - cxx) + pgCC*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) # Compaq C++ - archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -13400,7 +14863,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -13410,7 +14873,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -13421,15 +14884,31 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + openbsd*) + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; osf3*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' hardcode_libdir_separator_CXX=: @@ -13439,14 +14918,14 @@ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx) + cxx*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13464,7 +14943,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13483,13 +14962,13 @@ ;; osf4* | osf5*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' hardcode_libdir_separator_CXX=: @@ -13498,17 +14977,17 @@ # the KAI C++ compiler. old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - cxx) + cxx*) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ $rm $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -13527,7 +15006,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13548,27 +15027,14 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - sco*) - archive_cmds_need_lc_CXX=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - lcc) + lcc*) # Lucid # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13581,36 +15047,33 @@ ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no case $host_os in - solaris2.0-5 | solaris2.0-5.*) ;; + solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; esac link_all_deplibs_CXX=yes - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13618,9 +15081,9 @@ # in the archive. old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ;; - gcx) + gcx*) # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' @@ -13630,9 +15093,9 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -13641,9 +15104,9 @@ else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -13656,12 +15119,63 @@ ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13681,8 +15195,8 @@ ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -13718,7 +15232,7 @@ # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` for p in `eval $output_verbose_link_cmd`; do case $p in @@ -13758,7 +15272,7 @@ fi ;; - *.$objext|*.$libext) + *.$objext) # This assumes that the test object file only shows up # once in the compiler output. if test "$p" = "conftest.$objext"; then @@ -13794,6 +15308,29 @@ $rm -f confest.$objext +# PORTME: override above test on systems where it is broken +case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + +solaris*) + case $cc_basename in + CC*) + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + postdeps_CXX='-lCstd -lCrun' + ;; + esac + ;; +esac + + case " $postdeps_CXX " in *" -lc "*) archive_cmds_need_lc_CXX=no ;; esac @@ -13802,8 +15339,8 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -13841,6 +15378,10 @@ # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then lt_prog_compiler_pic_CXX=-Kconform_pic @@ -13849,7 +15390,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) ;; *) @@ -13874,18 +15415,28 @@ ;; chorus*) case $cc_basename in - cxch68) + cxch68*) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_CXX='-qnocommon' + lt_prog_compiler_wl_CXX='-Wl,' + ;; + esac + ;; dgux*) case $cc_basename in - ec++) + ec++*) lt_prog_compiler_pic_CXX='-KPIC' ;; - ghcx) + ghcx*) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-pic' ;; @@ -13893,22 +15444,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC) + CC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then lt_prog_compiler_pic_CXX='+Z' fi ;; - aCC) + aCC*) lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -13921,9 +15472,13 @@ ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC) + CC*) lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX='-non_shared' # CC pic flag -KPIC is the default. @@ -13932,20 +15487,26 @@ ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + KCC*) # KAI C++ Compiler lt_prog_compiler_wl_CXX='--backend -Wl,' lt_prog_compiler_pic_CXX='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' ;; - cxx) + pgCC*) + # Portland Group C++ compiler. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -13962,25 +15523,25 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) lt_prog_compiler_pic_CXX='-W c,exportall' ;; *) ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC) + KCC*) lt_prog_compiler_wl_CXX='--backend -Wl,' ;; - RCC) + RCC*) # Rational C++ 2.4.1 lt_prog_compiler_pic_CXX='-pic' ;; - cxx) + cxx*) # Digital/Compaq C++ lt_prog_compiler_wl_CXX='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -13994,24 +15555,15 @@ ;; psos*) ;; - sco*) - case $cc_basename in - CC) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' lt_prog_compiler_wl_CXX='-Qoption ld ' ;; - gcx) + gcx*) # Green Hills C++ Compiler lt_prog_compiler_pic_CXX='-PIC' ;; @@ -14021,12 +15573,12 @@ ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x lt_prog_compiler_pic_CXX='-pic' lt_prog_compiler_static_CXX='-Bstatic' ;; - lcc) + lcc*) # Lucid lt_prog_compiler_pic_CXX='-pic' ;; @@ -14036,7 +15588,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 lt_prog_compiler_pic_CXX='-KPIC' ;; @@ -14044,7 +15596,14 @@ ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac ;; vxworks*) ;; @@ -14054,16 +15613,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14077,26 +15636,28 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14083: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15642: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14087: \$? = $ac_status" >&5 + echo "$as_me:15646: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_CXX=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -14109,7 +15670,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_CXX= @@ -14119,8 +15680,50 @@ ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_CXX=yes + fi + else + lt_prog_compiler_static_works_CXX=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14131,60 +15734,58 @@ mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14150: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15746: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14154: \$? = $ac_status" >&5 + echo "$as_me:15750: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -14194,8 +15795,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -14212,22 +15813,20 @@ export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; + linux* | k*bsd*-gnu) + link_all_deplibs_CXX=no ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -14245,8 +15844,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -14260,6 +15859,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX compiler_flags=-v linker_flags=-v verstring= @@ -14282,20 +15882,20 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -14305,7 +15905,20 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -14370,7 +15983,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -14379,7 +15992,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14395,7 +16008,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -14407,7 +16020,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -14437,7 +16051,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -14460,7 +16074,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -14483,20 +16097,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -14514,14 +16125,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -14541,9 +16157,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -14558,7 +16174,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -14569,7 +16185,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -14581,6 +16197,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -14624,29 +16252,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -14656,6 +16281,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -14665,7 +16302,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -14693,8 +16330,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -14714,7 +16356,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -14732,13 +16374,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -14764,7 +16399,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -14797,6 +16432,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14808,16 +16466,21 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then + test -n "$runpath_var_CXX" || \ + test "X$hardcode_automatic_CXX" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_CXX" != no && @@ -14837,8 +16500,8 @@ # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -14849,1001 +16512,176 @@ enable_fast_install=needless fi -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_CXX \ + CC_CXX \ + LD_CXX \ + lt_prog_compiler_wl_CXX \ + lt_prog_compiler_pic_CXX \ + lt_prog_compiler_static_CXX \ + lt_prog_compiler_no_builtin_flag_CXX \ + export_dynamic_flag_spec_CXX \ + thread_safe_flag_spec_CXX \ + whole_archive_flag_spec_CXX \ + enable_shared_with_static_runtimes_CXX \ + old_archive_cmds_CXX \ + old_archive_from_new_cmds_CXX \ + predep_objects_CXX \ + postdep_objects_CXX \ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ + postuninstall_cmds_CXX \ + old_archive_from_expsyms_cmds_CXX \ + allow_undefined_flag_CXX \ + no_undefined_flag_CXX \ + export_symbols_cmds_CXX \ + hardcode_libdir_flag_spec_CXX \ + hardcode_libdir_flag_spec_ld_CXX \ + hardcode_libdir_separator_CXX \ + hardcode_automatic_CXX \ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do + + case $var in + old_archive_cmds_CXX | \ + old_archive_from_new_cmds_CXX | \ + archive_cmds_CXX | \ + archive_expsym_cmds_CXX | \ + module_cmds_CXX | \ + module_expsym_cmds_CXX | \ + old_archive_from_expsyms_cmds_CXX | \ + export_symbols_cmds_CXX | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ;; esac -fi -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= +cfgfile="$ofile" - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL - darwin*) - # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Whether or not to build static libraries. +build_old_libs=$enable_static -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -fi +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install - ;; +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os - *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# An echo program that does not interpret backslashes. +echo=$lt_echo -#ifdef __STDC__ -# include -#else -# include -#endif +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -#undef shl_load +# A C compiler. +LTCC=$lt_LTCC -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} -#endif +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -int -main () -{ -return f != shl_load; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# A language-specific compiler. +CC=$lt_compiler_CXX -ac_cv_func_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Is the compiler the GNU C compiler? +with_gcc=$GCC_CXX -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# An ERE matcher. +EGREP=$lt_EGREP -ac_cv_lib_dld_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen +# The linker used to build libraries. +LD=$lt_LD_CXX -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# Whether we need hard or soft links. +LN_S=$lt_LN_S -#ifdef __STDC__ -# include -#else -# include -#endif +# A BSD-compatible nm program. +NM=$lt_NM -#undef dlopen +# A symbol stripping program +STRIP=$lt_STRIP -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} -#endif +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -int -main () -{ -return f != dlopen; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" -ac_cv_func_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Used on cygwin: assembler. +AS="$AS" -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_svld_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir +# The name of the directory that contains temporary libtool files. +objdir=$objdir # How to create reloadable object files. reload_flag=$lt_reload_flag @@ -15859,7 +16697,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -15874,7 +16712,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -16076,7 +16914,10 @@ # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -16148,29 +16989,55 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC compiler_F77=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } + +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -16178,21 +17045,21 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) - test "$enable_shared" = yes && enable_static=no +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 - -test "$ld_shlibs_F77" = no && can_build_shared=no +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -16201,8 +17068,8 @@ lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -16240,6 +17107,11 @@ lt_prog_compiler_pic_F77='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -16256,7 +17128,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -16282,6 +17154,16 @@ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_F77='-qnocommon' + lt_prog_compiler_wl_F77='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -16293,7 +17175,7 @@ lt_prog_compiler_wl_F77='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -16316,13 +17198,20 @@ lt_prog_compiler_static_F77='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fpic' + lt_prog_compiler_static_F77='-Bstatic' + ;; ccc*) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. @@ -16337,15 +17226,15 @@ lt_prog_compiler_static_F77='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_F77='-Kpic' - lt_prog_compiler_static_F77='-dn' - ;; - solaris*) - lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_F77='-Qoption ld ';; + *) + lt_prog_compiler_wl_F77='-Wl,';; + esac ;; sunos4*) @@ -16354,7 +17243,7 @@ lt_prog_compiler_static_F77='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -16367,6 +17256,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_can_build_shared_F77=no + ;; + uts4*) lt_prog_compiler_pic_F77='-pic' lt_prog_compiler_static_F77='-Bstatic' @@ -16378,16 +17278,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16401,26 +17301,28 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16407: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17307: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16411: \$? = $ac_status" >&5 + echo "$as_me:17311: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_F77=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -16433,7 +17335,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_F77= @@ -16443,8 +17345,50 @@ ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_F77=yes + fi + else + lt_prog_compiler_static_works_F77=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } + +if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +else + lt_prog_compiler_static_F77= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16455,60 +17399,58 @@ mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16474: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17411: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16478: \$? = $ac_status" >&5 + echo "$as_me:17415: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_F77=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -16518,8 +17460,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -16557,6 +17499,16 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -16567,6 +17519,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -16577,6 +17533,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_F77= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -16614,7 +17591,7 @@ allow_undefined_flag_F77=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs_F77=no fi @@ -16624,13 +17601,13 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=no + allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -16639,23 +17616,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + ld_shlibs_F77=no + fi + ;; + + interix3*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + 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' + ;; + + linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + link_all_deplibs_F77=no + else + ld_shlibs_F77=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_F77=no cat <&2 @@ -16669,13 +17693,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_F77=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_F77=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -16685,24 +17736,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_F77=no fi ;; esac - if test "$ld_shlibs_F77" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi + if test "$ld_shlibs_F77" = no; then + runpath_var= + hardcode_libdir_flag_spec_F77= + export_dynamic_flag_spec_F77= + whole_archive_flag_spec_F77= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -16714,7 +17760,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_F77=unsupported @@ -16736,9 +17782,21 @@ else export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -16755,7 +17813,7 @@ link_all_deplibs_F77=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -16774,8 +17832,12 @@ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_libdir_separator_F77= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -16783,48 +17845,45 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - always_export_symbols_F77=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_F77=yes if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag_F77='-berok' # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF program main end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -16835,19 +17894,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -16856,27 +17916,23 @@ end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -16887,8 +17943,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16897,13 +17955,11 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_F77=' ${wl}-bernotok' allow_undefined_flag_F77=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_F77=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77=' ' + whole_archive_flag_spec_F77='$convenience' archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -16916,7 +17972,7 @@ ld_shlibs_F77=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_F77=-rdynamic ;; @@ -16926,68 +17982,68 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_F77=' ' - allow_undefined_flag_F77=no + allow_undefined_flag_F77=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - archive_cmds_need_lc_F77=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - 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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc_F77=no hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='-all_load $convenience' + whole_archive_flag_spec_F77='' link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' else - ld_shlibs_F77=no + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' + ;; + *) + ld_shlibs_F77=no + ;; + esac fi ;; @@ -17021,8 +18077,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes hardcode_shlibpath_var_F77=no @@ -17030,7 +18086,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -17044,47 +18100,62 @@ export_dynamic_flag_spec_F77='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - ia64*) - hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_direct_F77=no hardcode_shlibpath_var_F77=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes ;; *) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: hardcode_direct_F77=yes export_dynamic_flag_spec_F77='${wl}-E' @@ -17098,7 +18169,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' @@ -17108,7 +18179,7 @@ link_all_deplibs_F77=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -17131,7 +18202,8 @@ hardcode_direct_F77=yes hardcode_shlibpath_var_F77=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' export_dynamic_flag_spec_F77='${wl}-E' else @@ -17141,7 +18213,7 @@ hardcode_libdir_flag_spec_F77='-R$libdir' ;; *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ;; esac @@ -17152,14 +18224,14 @@ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_minus_L_F77=yes allow_undefined_flag_F77=unsupported - archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' @@ -17171,13 +18243,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' else allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_F77='-rpath $libdir' @@ -17185,21 +18257,15 @@ hardcode_libdir_separator_F77=: ;; - sco3.2v5*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_F77=' -z text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -17208,8 +18274,18 @@ hardcode_shlibpath_var_F77=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac link_all_deplibs_F77=yes ;; @@ -17218,7 +18294,7 @@ if test "x$host_vendor" = xsequent; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -17266,36 +18342,45 @@ fi ;; - sysv4.2uw2*) - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_F77='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no ;; - sysv5*) - no_undefined_flag_F77=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_F77= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_F77='${wl}-z,text' + allow_undefined_flag_F77='${wl}-z,nodefs' + archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes + export_dynamic_flag_spec_F77='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -17310,15 +18395,10 @@ esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -17336,8 +18416,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -17351,6 +18431,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_F77 + pic_flag=$lt_prog_compiler_pic_F77 compiler_flags=-v linker_flags=-v verstring= @@ -17373,20 +18454,20 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -17396,7 +18477,20 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -17461,7 +18555,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -17470,7 +18564,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -17486,7 +18580,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -17498,7 +18592,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -17528,7 +18623,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -17551,7 +18646,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -17574,20 +18669,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -17605,14 +18697,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -17632,9 +18729,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -17649,7 +18746,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -17660,7 +18757,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -17672,6 +18769,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -17715,29 +18824,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -17747,6 +18853,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -17756,7 +18874,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -17784,8 +18902,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -17805,7 +18928,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -17823,13 +18946,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -17855,7 +18971,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -17888,6 +19004,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -17899,16 +19038,21 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then + test -n "$runpath_var_F77" || \ + test "X$hardcode_automatic_F77" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_F77" != no && @@ -17928,8 +19072,8 @@ # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -17940,36 +19084,6 @@ enable_fast_install=needless fi -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - - # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -17984,7 +19098,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -18084,6 +19199,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18095,6 +19216,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_F77 @@ -18114,7 +19238,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -18145,7 +19269,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -18160,7 +19284,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -18362,7 +19486,10 @@ # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -18383,7 +19510,6 @@ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -18395,26 +19521,55 @@ lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC compiler_GCJ=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no +old_archive_cmds_GCJ=$old_archive_cmds + ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change ## the running order or otherwise move them around unless you know exactly @@ -18426,8 +19581,8 @@ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18441,26 +19596,28 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18447: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19602: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18451: \$? = $ac_status" >&5 + echo "$as_me:19606: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -18474,8 +19631,8 @@ lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -18513,6 +19670,11 @@ lt_prog_compiler_pic_GCJ='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -18529,7 +19691,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -18555,6 +19717,16 @@ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_GCJ='-qnocommon' + lt_prog_compiler_wl_GCJ='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -18566,7 +19738,7 @@ lt_prog_compiler_wl_GCJ='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -18589,13 +19761,20 @@ lt_prog_compiler_static_GCJ='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-fpic' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. @@ -18610,15 +19789,15 @@ lt_prog_compiler_static_GCJ='-non_shared' ;; - sco3.2v5*) - lt_prog_compiler_pic_GCJ='-Kpic' - lt_prog_compiler_static_GCJ='-dn' - ;; - solaris*) - lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_GCJ='-Qoption ld ';; + *) + lt_prog_compiler_wl_GCJ='-Wl,';; + esac ;; sunos4*) @@ -18627,7 +19806,7 @@ lt_prog_compiler_static_GCJ='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -18640,6 +19819,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_can_build_shared_GCJ=no + ;; + uts4*) lt_prog_compiler_pic_GCJ='-pic' lt_prog_compiler_static_GCJ='-Bstatic' @@ -18651,16 +19841,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18674,26 +19864,28 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18680: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19870: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18684: \$? = $ac_status" >&5 + echo "$as_me:19874: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_prog_compiler_pic_works_GCJ=yes fi fi $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -18706,7 +19898,7 @@ fi fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic_GCJ= @@ -18716,8 +19908,50 @@ ;; esac -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_GCJ=yes + fi + else + lt_prog_compiler_static_works_GCJ=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } + +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +else + lt_prog_compiler_static_GCJ= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18728,60 +19962,58 @@ mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18747: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19974: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18751: \$? = $ac_status" >&5 + echo "$as_me:19978: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_GCJ=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -18791,8 +20023,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -18830,6 +20062,16 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $host_os in cygwin* | mingw* | pw32*) @@ -18840,6 +20082,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -18850,6 +20096,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_GCJ= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -18887,7 +20154,7 @@ allow_undefined_flag_GCJ=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs_GCJ=no fi @@ -18897,13 +20164,13 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_GCJ='-L$libdir' - allow_undefined_flag_GCJ=no + allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -18912,23 +20179,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + ld_shlibs_GCJ=no + fi + ;; + + interix3*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + 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' + ;; + + linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs_GCJ=no cat <&2 @@ -18942,13 +20256,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_GCJ=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_GCJ=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + esac + ;; + sunos4*) archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -18958,24 +20299,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs_GCJ=no fi ;; esac - if test "$ld_shlibs_GCJ" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= - fi + if test "$ld_shlibs_GCJ" = no; then + runpath_var= + hardcode_libdir_flag_spec_GCJ= + export_dynamic_flag_spec_GCJ= + whole_archive_flag_spec_GCJ= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -18987,7 +20323,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct_GCJ=unsupported @@ -19009,9 +20345,21 @@ else export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -19028,7 +20376,7 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -19047,8 +20395,12 @@ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_libdir_separator_GCJ= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -19056,22 +20408,23 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - always_export_symbols_GCJ=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_GCJ=yes if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19087,27 +20440,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -19118,19 +20467,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF @@ -19149,27 +20499,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -19180,8 +20526,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -19190,13 +20538,11 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag_GCJ=' ${wl}-bernotok' allow_undefined_flag_GCJ=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - always_export_symbols_GCJ=yes # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ=' ' + whole_archive_flag_spec_GCJ='$convenience' archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -19209,7 +20555,7 @@ ld_shlibs_GCJ=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_GCJ=-rdynamic ;; @@ -19219,68 +20565,68 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_GCJ=' ' - allow_undefined_flag_GCJ=no + allow_undefined_flag_GCJ=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - archive_cmds_need_lc_GCJ=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.012) - allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - 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 $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc_GCJ=no hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='-all_load $convenience' + whole_archive_flag_spec_GCJ='' link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' else - ld_shlibs_GCJ=no + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' + ;; + *) + ld_shlibs_GCJ=no + ;; + esac fi ;; @@ -19314,8 +20660,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes hardcode_shlibpath_var_GCJ=no @@ -19323,7 +20669,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -19337,47 +20683,62 @@ export_dynamic_flag_spec_GCJ='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + case $host_cpu in + hppa*64*|ia64*) hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - ;; - ia64*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes ;; *) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: hardcode_direct_GCJ=yes export_dynamic_flag_spec_GCJ='${wl}-E' @@ -19391,7 +20752,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' @@ -19401,7 +20762,7 @@ link_all_deplibs_GCJ=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -19424,7 +20785,8 @@ hardcode_direct_GCJ=yes hardcode_shlibpath_var_GCJ=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' export_dynamic_flag_spec_GCJ='${wl}-E' else @@ -19434,7 +20796,7 @@ hardcode_libdir_flag_spec_GCJ='-R$libdir' ;; *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ;; esac @@ -19445,14 +20807,14 @@ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_minus_L_GCJ=yes allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' @@ -19464,13 +20826,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' else allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_GCJ='-rpath $libdir' @@ -19478,21 +20840,15 @@ hardcode_libdir_separator_GCJ=: ;; - sco3.2v5*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) no_undefined_flag_GCJ=' -z text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -19501,8 +20857,18 @@ hardcode_shlibpath_var_GCJ=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac link_all_deplibs_GCJ=yes ;; @@ -19511,7 +20877,7 @@ if test "x$host_vendor" = xsequent; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -19559,36 +20925,45 @@ fi ;; - sysv4.2uw2*) - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - no_undefined_flag_GCJ='${wl}-z ${wl}text' if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no ;; - sysv5*) - no_undefined_flag_GCJ=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_GCJ= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_GCJ='${wl}-z,text' + allow_undefined_flag_GCJ='${wl}-z,nodefs' + archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -19603,15 +20978,10 @@ esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -19629,8 +20999,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -19644,6 +21014,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl_GCJ + pic_flag=$lt_prog_compiler_pic_GCJ compiler_flags=-v linker_flags=-v verstring= @@ -19666,20 +21037,20 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -19689,7 +21060,20 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -19754,7 +21138,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -19763,7 +21147,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -19779,7 +21163,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -19791,7 +21175,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -19821,7 +21206,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -19844,7 +21229,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -19867,20 +21252,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -19898,14 +21280,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -19925,9 +21312,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -19942,7 +21329,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -19953,7 +21340,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -19965,6 +21352,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -20008,29 +21407,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -20040,6 +21436,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -20049,7 +21457,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -20077,8 +21485,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -20098,7 +21511,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -20116,13 +21529,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -20148,7 +21554,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -20181,6 +21587,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -20192,16 +21621,21 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_GCJ" != no && @@ -20221,851 +21655,16 @@ # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 - -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shl_load; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -int -main () -{ -shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_shl_load=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" -else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != dlopen; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_svld_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld_link (); -int -main () -{ -dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dld_dld_link=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless fi @@ -21082,7 +21681,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -21182,6 +21782,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -21193,6 +21799,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_GCJ @@ -21212,7 +21821,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -21243,7 +21852,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -21258,7 +21867,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -21460,7 +22069,10 @@ # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -21480,7 +22092,6 @@ RC) - # Source file extension for RC test sources. ac_ext=rc @@ -21499,15 +22110,42 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -21523,7 +22161,8 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -21623,6 +22262,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -21634,6 +22279,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -21653,7 +22301,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -21684,7 +22332,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -21699,7 +22347,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -21901,7 +22549,10 @@ # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -21948,7 +22599,7 @@ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' +LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion @@ -22003,8 +22654,8 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22030,17 +22681,17 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test -n "$MSGFMT"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 + { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22055,32 +22706,33 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi GMSGFMT=$ac_cv_path_GMSGFMT - if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then - echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 -echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 + { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 +echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; } GMSGFMT=":" fi MSGFMT=$GMSGFMT @@ -22089,8 +22741,8 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22116,11 +22768,11 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test -n "$XGETTEXT"; then - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 + { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -22128,8 +22780,8 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6 + { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5 +echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi fi @@ -22139,8 +22791,7 @@ - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22152,8 +22803,8 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`" - echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5 -echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5 +echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; } if test "${kde_cv_stl_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22181,41 +22832,37 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_stl_works=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_stl_works=no + kde_cv_stl_works=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5 -echo "${ECHO_T}$kde_cv_stl_works" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5 +echo "${ECHO_T}$kde_cv_stl_works" >&6; } if test "$kde_cv_stl_works" = "yes"; then # back compatible @@ -22244,15 +22891,14 @@ -echo "$as_me:$LINENO: checking for strlcat" >&5 -echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for strlcat" >&5 +echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; } if test "${kde_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22264,9 +22910,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22292,35 +22935,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_strlcat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_strlcat=no + kde_cv_func_strlcat=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -22333,11 +22972,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5 -echo "${ECHO_T}$kde_cv_func_strlcat" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5 +echo "${ECHO_T}$kde_cv_func_strlcat" >&6; } -echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5 -echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5 +echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22358,8 +22997,7 @@ if test "x$kde_cv_proto_strlcat" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22397,37 +23035,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_strlcat=yes kde_cv_proto_strlcat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_strlcat="strlcat unavailable" + kde_cv_proto_strlcat="strlcat unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -22440,8 +23075,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5 -echo "${ECHO_T}$kde_cv_proto_strlcat" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5 +echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; } if test "x$kde_cv_func_strlcat" = xyes; then @@ -22465,15 +23100,14 @@ -echo "$as_me:$LINENO: checking for strlcpy" >&5 -echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for strlcpy" >&5 +echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; } if test "${kde_cv_func_strlcpy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22485,9 +23119,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22512,35 +23143,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_strlcpy=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_strlcpy=no + kde_cv_func_strlcpy=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -22553,11 +23180,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5 -echo "${ECHO_T}$kde_cv_func_strlcpy" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5 +echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; } -echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5 -echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5 +echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_strlcpy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22578,8 +23205,7 @@ if test "x$kde_cv_proto_strlcpy" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22616,37 +23242,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_strlcpy=yes kde_cv_proto_strlcpy=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_strlcpy="strlcpy unavailable" + kde_cv_proto_strlcpy="strlcpy unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -22659,8 +23282,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5 -echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5 +echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; } if test "x$kde_cv_func_strlcpy" = xyes; then @@ -22683,8 +23306,8 @@ - echo "$as_me:$LINENO: checking for main in -lutil" >&5 -echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for main in -lutil" >&5 +echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; } if test "${ac_cv_lib_util_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22701,52 +23324,49 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_util_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_util_main=no + ac_cv_lib_util_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5 -echo "${ECHO_T}$ac_cv_lib_util_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5 +echo "${ECHO_T}$ac_cv_lib_util_main" >&6; } if test $ac_cv_lib_util_main = yes; then LIBUTIL="-lutil" fi - echo "$as_me:$LINENO: checking for main in -lcompat" >&5 -echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for main in -lcompat" >&5 +echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; } if test "${ac_cv_lib_compat_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22763,53 +23383,50 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_compat_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_compat_main=no + ac_cv_lib_compat_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5 -echo "${ECHO_T}$ac_cv_lib_compat_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5 +echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; } if test $ac_cv_lib_compat_main = yes; then LIBCOMPAT="-lcompat" fi kde_have_crypt= - echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; } if test "${ac_cv_lib_crypt_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22822,61 +23439,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char crypt (); int main () { -crypt (); +return crypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_crypt_crypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_crypt_crypt=no + ac_cv_lib_crypt_crypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; } if test $ac_cv_lib_crypt_crypt = yes; then LIBCRYPT="-lcrypt"; kde_have_crypt=yes else - echo "$as_me:$LINENO: checking for crypt in -lc" >&5 -echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for crypt in -lc" >&5 +echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; } if test "${ac_cv_lib_c_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22889,56 +23503,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char crypt (); int main () { -crypt (); +return crypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_c_crypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_c_crypt=no + ac_cv_lib_c_crypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5 -echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; } if test $ac_cv_lib_c_crypt = yes; then kde_have_crypt=yes else @@ -22964,13 +23575,13 @@ fi - echo "$as_me:$LINENO: checking for socklen_t" >&5 -echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for socklen_t" >&5 +echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; } if test "${kde_cv_socklen_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22999,27 +23610,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_socklen_t=yes kde_cv_socklen_t_equiv=socklen_t @@ -23028,8 +23634,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -23039,17 +23647,17 @@ fi - echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5 -echo "${ECHO_T}$kde_cv_socklen_t" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5 +echo "${ECHO_T}$kde_cv_socklen_t" >&6; } if test $kde_cv_socklen_t = no; then - echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5 -echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5 +echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; } if test "${kde_cv_socklen_t_equiv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else kde_cv_socklen_t_equiv=int - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -23078,27 +23686,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_socklen_t_equiv="$t" break @@ -23107,8 +23710,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -23119,8 +23724,8 @@ fi - echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5 -echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5 +echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; } fi cat >>confdefs.h <<_ACEOF @@ -23133,8 +23738,8 @@ _ACEOF - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23147,63 +23752,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23216,63 +23818,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi - echo "$as_me:$LINENO: checking for inet_ntoa" >&5 -echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for inet_ntoa" >&5 +echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; } if test "${ac_cv_func_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23299,72 +23898,63 @@ #undef inet_ntoa -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char inet_ntoa (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa) +#if defined __stub_inet_ntoa || defined __stub___inet_ntoa choke me -#else -char (*f) () = inet_ntoa; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != inet_ntoa; +return inet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_inet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_inet_ntoa=no + ac_cv_func_inet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; } if test $ac_cv_func_inet_ntoa = no; then - echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 -echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 +echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23377,63 +23967,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char inet_ntoa (); int main () { -inet_ntoa (); +return inet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_nsl_inet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_inet_ntoa=no + ac_cv_lib_nsl_inet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; } if test $ac_cv_lib_nsl_inet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi fi - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23460,72 +24047,63 @@ #undef connect -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) +#if defined __stub_connect || defined __stub___connect choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != connect; +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_connect=no + ac_cv_func_connect=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23538,64 +24116,61 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); int main () { -connect (); +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_connect=no + ac_cv_lib_socket_connect=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi fi - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23622,72 +24197,63 @@ #undef remove -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) +#if defined __stub_remove || defined __stub___remove choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != remove; +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_remove=no + ac_cv_func_remove=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23700,56 +24266,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); int main () { -remove (); +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix_remove=no + ac_cv_lib_posix_remove=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -23757,8 +24320,8 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23785,73 +24348,64 @@ #undef shmat -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) +#if defined __stub_shmat || defined __stub___shmat choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shmat; +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shmat=no + ac_cv_func_shmat=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = yes; then : else - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23864,56 +24418,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); int main () { -shmat (); +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ipc_shmat=no + ac_cv_lib_ipc_shmat=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -23927,18 +24478,19 @@ for ac_header in sys/types.h stdint.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23949,41 +24501,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23992,24 +24540,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24017,9 +24563,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24043,25 +24590,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24079,18 +24620,19 @@ for ac_header in sys/bitypes.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24101,41 +24643,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24144,24 +24682,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24169,9 +24705,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24195,25 +24732,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24227,8 +24758,8 @@ # darwin requires a poll emulation library - echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 -echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 +echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; } if test "${ac_cv_lib_poll_poll+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24241,56 +24772,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char poll (); int main () { -poll (); +return poll (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_poll_poll=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_poll_poll=no + ac_cv_lib_poll_poll=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 -echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 +echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; } if test $ac_cv_lib_poll_poll = yes; then LIB_POLL="-lpoll" fi @@ -24301,18 +24829,19 @@ for ac_header in Carbon/Carbon.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24323,41 +24852,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24366,24 +24891,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24391,9 +24914,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24417,25 +24941,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24450,17 +24968,17 @@ # CoreAudio framework if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then - echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 -echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 +echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; } if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 +echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5 -echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5 +echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24471,41 +24989,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5 -echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5 +echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24514,24 +25028,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24539,9 +25051,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24565,25 +25078,18 @@ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 -echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 +echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; } if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 +echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; } fi if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then @@ -24600,8 +25106,8 @@ - echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5 -echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5 +echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; } kde_libs_safe="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS -lresolv" cat >conftest.$ac_ext <<_ACEOF @@ -24627,31 +25133,27 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then LIBRESOLV="-lresolv" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_RES_INIT 1 @@ -24662,25 +25164,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_libs_safe -echo "$as_me:$LINENO: checking for res_init" >&5 -echo $ECHO_N "checking for res_init... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for res_init" >&5 +echo $ECHO_N "checking for res_init... $ECHO_C" >&6; } if test "${kde_cv_func_res_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -24692,9 +25194,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24720,35 +25219,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_res_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_res_init=no + kde_cv_func_res_init=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -24761,11 +25256,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5 -echo "${ECHO_T}$kde_cv_func_res_init" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5 +echo "${ECHO_T}$kde_cv_func_res_init" >&6; } -echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5 -echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5 +echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_res_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24786,8 +25281,7 @@ if test "x$kde_cv_proto_res_init" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -24825,37 +25319,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_res_init=yes kde_cv_proto_res_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_res_init="res_init unavailable" + kde_cv_proto_res_init="res_init unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -24868,8 +25359,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5 -echo "${ECHO_T}$kde_cv_proto_res_init" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5 +echo "${ECHO_T}$kde_cv_proto_res_init" >&6; } if test "x$kde_cv_func_res_init" = xyes; then @@ -24896,8 +25387,8 @@ LIBSOCKET="$X_EXTRA_LIBS" - echo "$as_me:$LINENO: checking for killpg in -lucb" >&5 -echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5 +echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; } if test "${ac_cv_lib_ucb_killpg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24910,69 +25401,66 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char killpg (); int main () { -killpg (); +return killpg (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ucb_killpg=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ucb_killpg=no + ac_cv_lib_ucb_killpg=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5 -echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5 +echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; } if test $ac_cv_lib_ucb_killpg = yes; then LIBUCB="-lucb" fi case $host in *-*-lynxos* ) - echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5 -echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5 +echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; } CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__" - echo "$as_me:$LINENO: result: disabled" >&5 -echo "${ECHO_T}disabled" >&6 - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6; } + { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24985,64 +25473,61 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostbyname=no + ac_cv_lib_bsd_gethostbyname=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } if test $ac_cv_lib_bsd_gethostbyname = yes; then LIBSOCKET="-lbsd" fi ;; esac - echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6; } if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25053,61 +25538,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef int ac__type_new_; int main () { -if ((int *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (int)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int=no + ac_cv_type_int=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6; } -echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; } if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_int" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -25117,10 +25598,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25128,27 +25610,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25158,10 +25635,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25169,56 +25647,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -25226,27 +25701,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25256,10 +25726,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25267,50 +25738,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -25321,10 +25790,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25332,52 +25802,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +'') if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25385,8 +25848,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (int)); } -unsigned long ulongval () { return (long) (sizeof (int)); } + typedef int ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -25395,35 +25859,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (int))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (int)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (int)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25434,28 +25907,31 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_int=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int _ACEOF - echo "$as_me:$LINENO: checking for short" >&5 -echo $ECHO_N "checking for short... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6; } if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25466,61 +25942,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef short ac__type_new_; int main () { -if ((short *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (short)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_short=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_short=no + ac_cv_type_short=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 -echo "${ECHO_T}$ac_cv_type_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6; } -echo "$as_me:$LINENO: checking size of short" >&5 -echo $ECHO_N "checking size of short... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6; } if test "${ac_cv_sizeof_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_short" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -25530,10 +26002,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25541,27 +26014,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25571,10 +26039,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25582,56 +26051,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -25639,27 +26105,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25669,10 +26130,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25680,50 +26142,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -25734,10 +26194,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25745,52 +26206,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_short=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +'') if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25798,8 +26252,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (short)); } -unsigned long ulongval () { return (long) (sizeof (short)); } + typedef short ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -25808,35 +26263,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (short))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (short)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (short)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25847,28 +26311,31 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_short=0 fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short _ACEOF - echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6; } if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25879,61 +26346,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef long ac__type_new_; int main () { -if ((long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (long)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long=no + ac_cv_type_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6; } -echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -25943,10 +26406,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25954,27 +26418,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25984,10 +26443,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25995,56 +26455,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -26052,27 +26509,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26082,10 +26534,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -26093,50 +26546,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -26147,10 +26598,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26158,52 +26610,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +'') if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26211,8 +26656,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (long)); } -unsigned long ulongval () { return (long) (sizeof (long)); } + typedef long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -26221,35 +26667,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26260,28 +26715,31 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_long=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF - echo "$as_me:$LINENO: checking for char *" >&5 -echo $ECHO_N "checking for char *... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for char *" >&5 +echo $ECHO_N "checking for char *... $ECHO_C" >&6; } if test "${ac_cv_type_char_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26292,61 +26750,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef char * ac__type_new_; int main () { -if ((char * *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (char *)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_char_p=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char_p=no + ac_cv_type_char_p=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 -echo "${ECHO_T}$ac_cv_type_char_p" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 +echo "${ECHO_T}$ac_cv_type_char_p" >&6; } -echo "$as_me:$LINENO: checking size of char *" >&5 -echo $ECHO_N "checking size of char *... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of char *" >&5 +echo $ECHO_N "checking size of char *... $ECHO_C" >&6; } if test "${ac_cv_sizeof_char_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_char_p" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -26356,10 +26810,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -26367,27 +26822,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26397,10 +26847,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26408,56 +26859,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -26465,27 +26913,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26495,10 +26938,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -26506,50 +26950,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -26560,10 +27002,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26571,52 +27014,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_char_p=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +'') if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (char *) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26624,8 +27060,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (char *)); } -unsigned long ulongval () { return (long) (sizeof (char *)); } + typedef char * ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -26634,35 +27071,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (char *))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (char *)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (char *)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26673,30 +27119,33 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (char *) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_char_p=0 fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p _ACEOF -echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26709,56 +27158,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then LIBDL="-ldl" @@ -26767,8 +27213,8 @@ fi -echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 -echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 +echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_unload+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26781,56 +27227,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_unload (); int main () { -shl_unload (); +return shl_unload (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_unload=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_unload=no + ac_cv_lib_dld_shl_unload=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; } if test $ac_cv_lib_dld_shl_unload = yes; then LIBDL="-ldld" @@ -26844,8 +27287,8 @@ - echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26856,61 +27299,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef size_t ac__type_new_; int main () { -if ((size_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no + ac_cv_type_size_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -echo "$as_me:$LINENO: checking size of size_t" >&5 -echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of size_t" >&5 +echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; } if test "${ac_cv_sizeof_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_size_t" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -26920,10 +27359,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -26931,27 +27371,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26961,10 +27396,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26972,56 +27408,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -27029,27 +27462,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -27059,10 +27487,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -27070,50 +27499,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -27124,10 +27551,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27135,52 +27563,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_size_t=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +'') if test "$ac_cv_type_size_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_size_t=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27188,8 +27609,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (size_t)); } -unsigned long ulongval () { return (long) (sizeof (size_t)); } + typedef size_t ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -27198,35 +27620,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (size_t))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (size_t)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (size_t)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27237,29 +27668,32 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +if test "$ac_cv_type_size_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_size_t=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_size_t=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t _ACEOF - echo "$as_me:$LINENO: checking for unsigned long" >&5 -echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } if test "${ac_cv_type_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27270,61 +27704,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef unsigned long ac__type_new_; int main () { -if ((unsigned long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned long)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_unsigned_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long=no + ac_cv_type_unsigned_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } -echo "$as_me:$LINENO: checking size of unsigned long" >&5 -echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_unsigned_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -27334,10 +27764,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -27345,27 +27776,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -27375,10 +27801,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27386,56 +27813,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -27443,27 +27867,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -27473,10 +27892,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -27484,50 +27904,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -27538,10 +27956,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27549,52 +27968,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +'') if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27602,8 +28014,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (unsigned long)); } -unsigned long ulongval () { return (long) (sizeof (unsigned long)); } + typedef unsigned long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -27612,35 +28025,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27651,30 +28073,33 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_unsigned_long=0 fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long _ACEOF - echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 -echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 +echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27695,36 +28120,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { { echo "$as_me:$LINENO: error: Apparently on your system our assumption sizeof size_t == sizeof unsigned long does not apply. Please mail kde-devel@kde.org with a description of your system! @@ -27736,18 +28156,18 @@ { (exit 1); exit 1; }; } fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: checking for PIE support" >&5 -echo $ECHO_N "checking for PIE support... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for PIE support" >&5 +echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; } if test "${kde_cv_val_pie_support+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -27777,35 +28197,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_val_pie_support=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_val_pie_support=no + kde_cv_val_pie_support=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS=$safe_CXXFLAGS @@ -27818,26 +28235,26 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 -echo "${ECHO_T}$kde_cv_val_pie_support" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 +echo "${ECHO_T}$kde_cv_val_pie_support" >&6; } - echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 -echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 +echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; } - # Check whether --enable-pie or --disable-pie was given. + # Check whether --enable-pie was given. if test "${enable_pie+set}" = set; then - enableval="$enable_pie" - kde_has_pie_support=$enableval + enableval=$enable_pie; kde_has_pie_support=$enableval else kde_has_pie_support=detect -fi; +fi + if test "$kde_has_pie_support" = "detect"; then kde_has_pie_support=$kde_cv_val_pie_support fi - echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 -echo "${ECHO_T}$kde_has_pie_support" >&6 + { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 +echo "${ECHO_T}$kde_has_pie_support" >&6; } KDE_USE_FPIE="" KDE_USE_PIE="" @@ -27856,18 +28273,19 @@ for ac_header in crt_externs.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27878,41 +28296,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27921,24 +28335,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -27946,9 +28358,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -27972,25 +28385,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -28002,8 +28409,8 @@ done -echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 -echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 +echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; } if test "${ac_cv_func__NSGetEnviron+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28030,68 +28437,59 @@ #undef _NSGetEnviron -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char _NSGetEnviron (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron) +#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron choke me -#else -char (*f) () = _NSGetEnviron; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != _NSGetEnviron; +return _NSGetEnviron (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func__NSGetEnviron=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func__NSGetEnviron=no + ac_cv_func__NSGetEnviron=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5 -echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5 +echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; } if test $ac_cv_func__NSGetEnviron = yes; then cat >>confdefs.h <<\_ACEOF @@ -28112,9 +28510,9 @@ for ac_func in vsnprintf snprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -28140,68 +28538,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -28218,32 +28608,32 @@ -# Check whether --enable-embedded or --disable-embedded was given. +# Check whether --enable-embedded was given. if test "${enable_embedded+set}" = set; then - enableval="$enable_embedded" - kde_use_qt_emb=$enableval + enableval=$enable_embedded; kde_use_qt_emb=$enableval else kde_use_qt_emb=no -fi; +fi + -# Check whether --enable-qtopia or --disable-qtopia was given. +# Check whether --enable-qtopia was given. if test "${enable_qtopia+set}" = set; then - enableval="$enable_qtopia" - kde_use_qt_emb_palm=$enableval + enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval else kde_use_qt_emb_palm=no -fi; +fi + -# Check whether --enable-mac or --disable-mac was given. +# Check whether --enable-mac was given. if test "${enable_mac+set}" = set; then - enableval="$enable_mac" - kde_use_qt_mac=$enableval + enableval=$enable_mac; kde_use_qt_mac=$enableval else kde_use_qt_mac=no -fi; +fi + # used to disable x11-specific stuff on special platforms @@ -28259,8 +28649,8 @@ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } if test "${kde_cv_have_x+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -28297,24 +28687,22 @@ /* end confdefs.h. */ #include <$x_direct_test_include> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # We can compile using X headers with no special include directory. ac_x_includes= else @@ -28365,6 +28753,7 @@ fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = NO @@ -28394,27 +28783,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then LIBS="$ac_save_LIBS" # We can link X programs with no special library path. ac_x_libraries= @@ -28422,7 +28807,7 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS="$ac_save_LIBS" + LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ @@ -28470,7 +28855,8 @@ done done fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = NO @@ -28480,21 +28866,26 @@ *-*-solaris*) ;; *) - rm -fr conftest.dir + rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' _ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -28502,7 +28893,7 @@ # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ;; + /usr/include) ac_x_includes= ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -28511,7 +28902,7 @@ esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi if test -z "$ac_x_includes"; then @@ -28555,12 +28946,12 @@ eval "$kde_cv_have_x" if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else - echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 -echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6 + { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 +echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; } fi if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then @@ -28588,8 +28979,8 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28602,56 +28993,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char IceConnectionNumber (); int main () { -IceConnectionNumber (); +return IceConnectionNumber (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then LIBSM="-lSM -lICE" fi @@ -28660,8 +29048,8 @@ LIB_X11='-lX11 $(LIBSOCKET)' -echo "$as_me:$LINENO: checking for libXext" >&5 -echo $ECHO_N "checking for libXext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libXext" >&5 +echo $ECHO_N "checking for libXext... $ECHO_C" >&6; } if test "${kde_cv_have_libXext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28695,36 +29083,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_have_libXext=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_have_libXext=no + kde_cv_have_libXext=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$kde_ldflags_safe @@ -28733,8 +29118,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 -echo "${ECHO_T}$kde_cv_have_libXext" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 +echo "${ECHO_T}$kde_cv_have_libXext" >&6; } if test "$kde_cv_have_libXext" = "no"; then { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure @@ -28880,8 +29265,8 @@ else PTHREAD_LIBS_save="$PTHREAD_LIBS" PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` - echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 -echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 +echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; } kde_save_LDFLAGS="$LDFLAGS" kde_save_LIBS="$LIBS" @@ -28892,9 +29277,9 @@ ;; esac as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` -echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 -echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 +echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28906,56 +29291,54 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_create (); int main () { -pthread_create (); +return pthread_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then LIBPTHREAD="$PTHREAD_LIBS_save" fi @@ -28968,8 +29351,8 @@ fi if test -z "$LIBPTHREAD"; then - echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28982,56 +29365,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_create (); int main () { -pthread_create (); +return pthread_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_pthread_pthread_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthread_pthread_create=no + ac_cv_lib_pthread_pthread_create=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } if test $ac_cv_lib_pthread_pthread_create = yes; then LIBPTHREAD="-lpthread" fi @@ -29039,8 +29419,8 @@ fi if test -z "$LIBPTHREAD" ; then - echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } kde_safe_libs=$LIBS LIBS="$LIBS -lpthread" cat >conftest.$ac_ext <<_ACEOF @@ -29059,40 +29439,37 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } LIBPTHREAD="-lpthread" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs fi @@ -29107,16 +29484,15 @@ USE_THREADS="" if test -z "$LIBPTHREAD"; then -echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 -echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 +echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; } kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -29143,34 +29519,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -29183,13 +29557,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : USE_THREADS="-D_THREAD_SAFE -pthread" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -29201,16 +29575,15 @@ case $host_os in solaris*) -echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 -echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 +echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; } kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -29237,34 +29610,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -29277,13 +29648,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : USE_THREADS="-mt" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -29310,17 +29681,17 @@ -echo "$as_me:$LINENO: checking for extra includes" >&5 -echo $ECHO_N "checking for extra includes... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for extra includes" >&5 +echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; } -# Check whether --with-extra-includes or --without-extra-includes was given. +# Check whether --with-extra-includes was given. if test "${with_extra_includes+set}" = set; then - withval="$with_extra_includes" - kde_use_extra_includes="$withval" + withval=$with_extra_includes; kde_use_extra_includes="$withval" else kde_use_extra_includes=NONE -fi; +fi + kde_extra_includes= if test -n "$kde_use_extra_includes" && \ test "$kde_use_extra_includes" != "NONE"; then @@ -29338,21 +29709,21 @@ fi -echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 -echo "${ECHO_T}$kde_use_extra_includes" >&6 +{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 +echo "${ECHO_T}$kde_use_extra_includes" >&6; } kde_extra_libs= -echo "$as_me:$LINENO: checking for extra libs" >&5 -echo $ECHO_N "checking for extra libs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for extra libs" >&5 +echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; } -# Check whether --with-extra-libs or --without-extra-libs was given. +# Check whether --with-extra-libs was given. if test "${with_extra_libs+set}" = set; then - withval="$with_extra_libs" - kde_use_extra_libs=$withval + withval=$with_extra_libs; kde_use_extra_libs=$withval else kde_use_extra_libs=NONE -fi; +fi + if test -n "$kde_use_extra_libs" && \ test "$kde_use_extra_libs" != "NONE"; then @@ -29371,14 +29742,14 @@ -echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 -echo "${ECHO_T}$kde_use_extra_libs" >&6 +{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 +echo "${ECHO_T}$kde_use_extra_libs" >&6; } -echo "$as_me:$LINENO: checking for libz" >&5 -echo $ECHO_N "checking for libz... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libz" >&5 +echo $ECHO_N "checking for libz... $ECHO_C" >&6; } if test "${ac_cv_lib_z+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29412,35 +29783,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_z='-lz'" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_z=no" + eval "ac_cv_lib_z=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" @@ -29453,8 +29821,8 @@ _ACEOF LIBZ="$ac_cv_lib_z" - echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 -echo "${ECHO_T}$ac_cv_lib_z" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 +echo "${ECHO_T}$ac_cv_lib_z" >&6; } else { { echo "$as_me:$LINENO: error: not found. Possibly configure picks up an outdated version @@ -29474,8 +29842,8 @@ -echo "$as_me:$LINENO: checking for libpng" >&5 -echo $ECHO_N "checking for libpng... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libpng" >&5 +echo $ECHO_N "checking for libpng... $ECHO_C" >&6; } if test "${ac_cv_lib_png+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29511,36 +29879,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_png='-lpng $LIBZ -lm'" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_png=no" + eval "ac_cv_lib_png=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" @@ -29554,19 +29919,19 @@ LIBPNG="$ac_cv_lib_png" - echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 -echo "${ECHO_T}$ac_cv_lib_png" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 +echo "${ECHO_T}$ac_cv_lib_png" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBPNG="" fi -echo "$as_me:$LINENO: checking for libjpeg6b" >&5 -echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5 +echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_6b+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29599,35 +29964,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_jpeg_6b=-ljpeg6b" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_jpeg_6b=no" + eval "ac_cv_lib_jpeg_6b=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" @@ -29637,14 +29999,14 @@ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then LIBJPEG="$ac_cv_lib_jpeg_6b" - echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -echo "$as_me:$LINENO: checking for libjpeg" >&5 -echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libjpeg" >&5 +echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_normal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29677,35 +30039,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_jpeg_normal=-ljpeg" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_jpeg_normal=no" + eval "ac_cv_lib_jpeg_normal=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" @@ -29715,11 +30074,11 @@ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then LIBJPEG="$ac_cv_lib_jpeg_normal" - echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBJPEG= @@ -29739,7 +30098,7 @@ do for j in jpeglib.h; do - echo "configure: 29742: $i/$j" >&5 + echo "configure: 30101: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 jpeg_incdir=$i @@ -29786,14 +30145,14 @@ - echo "$as_me:$LINENO: checking for perl" >&5 -echo $ECHO_N "checking for perl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for perl" >&5 +echo $ECHO_N "checking for perl... $ECHO_C" >&6; } if test -n "$PERL"; then kde_cv_path="$PERL"; else kde_cache=`echo perl | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29836,8 +30195,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: No Perl found in your $PATH. We need perl to generate some code." >&5 @@ -29846,8 +30205,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } PERL=$kde_cv_path fi @@ -29861,10 +30220,9 @@ -# Check whether --enable-mt or --disable-mt was given. +# Check whether --enable-mt was given. if test "${enable_mt+set}" = set; then - enableval="$enable_mt" - kde_use_qt_mt=$enableval + enableval=$enable_mt; kde_use_qt_mt=$enableval else if test $kde_qtver = 3; then @@ -29874,7 +30232,8 @@ fi -fi; +fi + USING_QT_MT="" @@ -29894,13 +30253,13 @@ else kde_check_threading_default=yes fi - # Check whether --enable-threading or --disable-threading was given. + # Check whether --enable-threading was given. if test "${enable_threading+set}" = set; then - enableval="$enable_threading" - kde_use_threading=$enableval + enableval=$enable_threading; kde_use_threading=$enableval else kde_use_threading=$kde_check_threading_default -fi; +fi + if test "x$kde_use_threading" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -29972,8 +30331,8 @@ LIBQT="$LIBQT $LIBDL" fi -echo "$as_me:$LINENO: checking for Qt" >&5 -echo $ECHO_N "checking for Qt... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Qt" >&5 +echo $ECHO_N "checking for Qt... $ECHO_C" >&6; } if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" @@ -29982,34 +30341,34 @@ qt_libraries="" qt_includes="" -# Check whether --with-qt-dir or --without-qt-dir was given. +# Check whether --with-qt-dir was given. if test "${with_qt_dir+set}" = set; then - withval="$with_qt_dir" - ac_qt_includes="$withval"/include + withval=$with_qt_dir; ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_bindir="$withval"/bin -fi; +fi -# Check whether --with-qt-includes or --without-qt-includes was given. -if test "${with_qt_includes+set}" = set; then - withval="$with_qt_includes" +# Check whether --with-qt-includes was given. +if test "${with_qt_includes+set}" = set; then + withval=$with_qt_includes; ac_qt_includes="$withval" -fi; +fi + kde_qt_libs_given=no -# Check whether --with-qt-libraries or --without-qt-libraries was given. +# Check whether --with-qt-libraries was given. if test "${with_qt_libraries+set}" = set; then - withval="$with_qt_libraries" - ac_qt_libraries="$withval" + withval=$with_qt_libraries; ac_qt_libraries="$withval" kde_qt_libs_given=yes -fi; +fi + if test "${ac_cv_have_qt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -30037,7 +30396,7 @@ do for j in $kde_qt_header; do - echo "configure: 30040: $i/$j" >&5 + echo "configure: 30399: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 qt_incdir=$i @@ -30074,8 +30433,7 @@ ac_qt_libraries="$qt_libdir" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -30212,13 +30570,13 @@ eval "$ac_cv_have_qt" if test "$have_qt" != yes; then - echo "$as_me:$LINENO: result: $have_qt" >&5 -echo "${ECHO_T}$have_qt" >&6; + { echo "$as_me:$LINENO: result: $have_qt" >&5 +echo "${ECHO_T}$have_qt" >&6; }; else ac_cv_have_qt="have_qt=yes \ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" - echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 -echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6 + { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 +echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; } qt_libraries="$ac_qt_libraries" qt_includes="$ac_qt_includes" @@ -30227,15 +30585,14 @@ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then -echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 -echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 +echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; } if test "${kde_cv_qt_direct+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -30356,12 +30713,12 @@ if test "$kde_cv_qt_direct" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } qt_libraries= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -30399,14 +30756,14 @@ fi - echo "$as_me:$LINENO: checking for moc" >&5 -echo $ECHO_N "checking for moc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for moc" >&5 +echo $ECHO_N "checking for moc... $ECHO_C" >&6; } if test -n "$MOC"; then kde_cv_path="$MOC"; else kde_cache=`echo moc | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30449,8 +30806,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found! Please check whether you installed Qt correctly. @@ -30471,22 +30828,22 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MOC=$kde_cv_path fi if test -z "$UIC_NOT_NEEDED"; then - echo "$as_me:$LINENO: checking for uic" >&5 -echo $ECHO_N "checking for uic... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for uic" >&5 +echo $ECHO_N "checking for uic... $ECHO_C" >&6; } if test -n "$UIC_PATH"; then kde_cv_path="$UIC_PATH"; else kde_cache=`echo uic | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30529,12 +30886,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } UIC_PATH="" else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } UIC_PATH=$kde_cv_path fi @@ -30564,10 +30921,10 @@ if test $kde_qtver = 3; then - echo "$as_me:$LINENO: checking whether uic supports -L " >&5 -echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether uic supports -L " >&5 +echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; } kde_cache=`echo L | sed 'y% .=/+-%____p_%'` - if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30590,22 +30947,22 @@ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : ac_uic_supports_libpath=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : ac_uic_supports_libpath=no fi - echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 -echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 +echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; } kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'` - if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30628,13 +30985,13 @@ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : ac_uic_supports_nounload=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : ac_uic_supports_nounload=no fi @@ -30665,15 +31022,14 @@ if test -n "$LIBJPEG"; then -echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 -echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 +echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; } if test "${kde_cv_qt_jpeg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -30706,35 +31062,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_qt_jpeg=no" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "kde_cv_qt_jpeg=yes" + eval "kde_cv_qt_jpeg=yes" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CXXFLAGS="$ac_save_CXXFLAGS" @@ -30750,12 +31103,12 @@ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } LIBJPEG_QT='$(LIBJPEG)' else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBJPEG_QT= fi @@ -30786,15 +31139,15 @@ -echo "$as_me:$LINENO: checking for rpath" >&5 -echo $ECHO_N "checking for rpath... $ECHO_C" >&6 -# Check whether --enable-rpath or --disable-rpath was given. +{ echo "$as_me:$LINENO: checking for rpath" >&5 +echo $ECHO_N "checking for rpath... $ECHO_C" >&6; } +# Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - USE_RPATH=$enableval + enableval=$enable_rpath; USE_RPATH=$enableval else USE_RPATH=yes -fi; +fi + if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then @@ -30818,11 +31171,11 @@ -echo "$as_me:$LINENO: result: $USE_RPATH" >&5 -echo "${ECHO_T}$USE_RPATH" >&6 +{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5 +echo "${ECHO_T}$USE_RPATH" >&6; } -echo "$as_me:$LINENO: checking for KDE" >&5 -echo $ECHO_N "checking for KDE... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE" >&5 +echo $ECHO_N "checking for KDE... $ECHO_C" >&6; } if test "${prefix}" != NONE; then kde_includes=${includedir} @@ -30874,7 +31227,7 @@ do for j in $kde_check_header; do - echo "configure: 30877: $i/$j" >&5 + echo "configure: 31230: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_incdir=$i @@ -30904,7 +31257,7 @@ do for j in $kde_check_lib; do - echo "configure: 30907: $i/$j" >&5 + echo "configure: 31260: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_libdir=$i @@ -30922,7 +31275,7 @@ do for j in "kde3/plugins/designer/kdewidgets.la"; do - echo "configure: 30925: $i/$j" >&5 + echo "configure: 31278: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_widgetdir=$i @@ -30981,12 +31334,12 @@ fi if test "$exec_prefix" = NONE; then ac_kde_exec_prefix="$ac_kde_prefix" - echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 -echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6 + { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 +echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; } else ac_kde_exec_prefix="$exec_prefix" - echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 -echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6 + { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 +echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; } fi kde_libraries="${libdir}" @@ -30995,8 +31348,8 @@ else ac_cv_have_kde="have_kde=yes \ ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" - echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 -echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6 + { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 +echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; } kde_libraries="$ac_kde_libraries" kde_includes="$ac_kde_includes" @@ -31034,8 +31387,8 @@ if test x$ac_uic_supports_libpath = xyes; then -echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 -echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 +echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; } if test "${kde_cv_uic_plugins+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31078,8 +31431,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 -echo "${ECHO_T}$kde_cv_uic_plugins" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 +echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } if test "$kde_cv_uic_plugins" != yes; then { { echo "$as_me:$LINENO: error: you need to install kdelibs first. @@ -31111,10 +31464,9 @@ - # Check whether --enable-path-check or --disable-path-check was given. + # Check whether --enable-path-check was given. if test "${enable_path_check+set}" = set; then - enableval="$enable_path_check" - + enableval=$enable_path_check; if test "$enableval" = "no"; then ac_use_path_checking="default" else ac_use_path_checking="" @@ -31128,13 +31480,14 @@ fi -fi; +fi + -echo "$as_me:$LINENO: checking for KDE paths" >&5 -echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE paths" >&5 +echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; } kde_result="" kde_cached_paths=yes if test "${kde_cv_all_paths+set}" = set; then @@ -31245,15 +31598,14 @@ else if test $kde_qtver = 1; then - echo "$as_me:$LINENO: result: compiling" >&5 -echo "${ECHO_T}compiling" >&6 - + { echo "$as_me:$LINENO: result: compiling" >&5 +echo "${ECHO_T}compiling" >&6; } - echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -31305,8 +31657,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! Check, if you installed the KDE header files correctly. @@ -31345,8 +31697,8 @@ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" fi -echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -31354,8 +31706,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the @@ -31548,15 +31900,14 @@ else if test $kde_qtver = 1; then - echo "$as_me:$LINENO: result: compiling" >&5 -echo "${ECHO_T}compiling" >&6 + { echo "$as_me:$LINENO: result: compiling" >&5 +echo "${ECHO_T}compiling" >&6; } - echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -31608,8 +31959,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! Check, if you installed the KDE header files correctly. @@ -31648,8 +31999,8 @@ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" fi -echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -31657,8 +32008,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the @@ -31750,22 +32101,22 @@ { (exit 1); exit 1; }; } else rm -f conftest* - echo "$as_me:$LINENO: result: $kde_result" >&5 -echo "${ECHO_T}$kde_result" >&6 + { echo "$as_me:$LINENO: result: $kde_result" >&5 +echo "${ECHO_T}$kde_result" >&6; } fi bindir=$kde_bindir -# Check whether --with-arts or --without-arts was given. +# Check whether --with-arts was given. if test "${with_arts+set}" = set; then - withval="$with_arts" - build_arts=$withval + withval=$with_arts; build_arts=$withval else build_arts=yes -fi; +fi + if test "$build_arts" '!=' "no"; then @@ -31798,14 +32149,14 @@ kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" - echo "$as_me:$LINENO: checking for dcopidl" >&5 -echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dcopidl" >&5 +echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; } if test -n "$DCOPIDL"; then kde_cv_path="$DCOPIDL"; else kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31848,8 +32199,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program dcopidl was not found! Please check whether you installed KDE correctly. @@ -31860,21 +32211,21 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DCOPIDL=$kde_cv_path fi - echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 -echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 +echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; } if test -n "$DCOPIDL2CPP"; then kde_cv_path="$DCOPIDL2CPP"; else kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31917,8 +32268,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found! Please check whether you installed KDE correctly. @@ -31929,22 +32280,22 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DCOPIDL2CPP=$kde_cv_path fi if test "$build_arts" '!=' "no"; then - echo "$as_me:$LINENO: checking for mcopidl" >&5 -echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for mcopidl" >&5 +echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; } if test -n "$MCOPIDL"; then kde_cv_path="$MCOPIDL"; else kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31987,8 +32338,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program mcopidl was not found! Please check whether you installed aRts correctly or use @@ -32001,21 +32352,21 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MCOPIDL=$kde_cv_path fi - echo "$as_me:$LINENO: checking for artsc-config" >&5 -echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for artsc-config" >&5 +echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; } if test -n "$ARTSCCONFIG"; then kde_cv_path="$ARTSCCONFIG"; else kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32058,8 +32409,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program artsc-config was not found! Please check whether you installed aRts correctly or use @@ -32072,22 +32423,22 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } ARTSCCONFIG=$kde_cv_path fi fi - echo "$as_me:$LINENO: checking for meinproc" >&5 -echo $ECHO_N "checking for meinproc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for meinproc" >&5 +echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; } if test -n "$MEINPROC"; then kde_cv_path="$MEINPROC"; else kde_cache=`echo meinproc | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32130,12 +32481,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MEINPROC=$kde_cv_path fi @@ -32164,14 +32515,14 @@ if test -n "$kde32ornewer"; then - echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 -echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 +echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; } if test -n "$KCONFIG_COMPILER"; then kde_cv_path="$KCONFIG_COMPILER"; else kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32214,8 +32565,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! Please check whether you installed KDE correctly. @@ -32226,21 +32577,21 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } KCONFIG_COMPILER=$kde_cv_path fi - echo "$as_me:$LINENO: checking for dcopidlng" >&5 -echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dcopidlng" >&5 +echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; } if test -n "$DCOPIDLNG"; then kde_cv_path="$DCOPIDLNG"; else kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32283,8 +32634,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found! Please check whether you installed KDE correctly. @@ -32295,8 +32646,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DCOPIDLNG=$kde_cv_path fi @@ -32304,14 +32655,14 @@ fi if test -n "$kde33ornewer"; then - echo "$as_me:$LINENO: checking for makekdewidgets" >&5 -echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for makekdewidgets" >&5 +echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } if test -n "$MAKEKDEWIDGETS"; then kde_cv_path="$MAKEKDEWIDGETS"; else kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32354,8 +32705,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! Please check whether you installed KDE correctly. @@ -32366,8 +32717,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MAKEKDEWIDGETS=$kde_cv_path fi @@ -32375,14 +32726,14 @@ fi - echo "$as_me:$LINENO: checking for xmllint" >&5 -echo $ECHO_N "checking for xmllint... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for xmllint" >&5 +echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; } if test -n "$XMLLINT"; then kde_cv_path="$XMLLINT"; else kde_cache=`echo xmllint | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32425,12 +32776,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } XMLLINT="" else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } XMLLINT=$kde_cv_path fi @@ -32445,7 +32796,7 @@ do for j in apps/ksgmltools2/customization/kde-chunk.xsl; do - echo "configure: 32448: $i/$j" >&5 + echo "configure: 32799: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 KDE_XSL_STYLESHEET=$i @@ -32607,13 +32958,12 @@ - echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5 -echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5 +echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; } if test "x$GXX" = "xyes"; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -32634,13 +32984,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "GCC visibility push" >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } kde_stdc_visibility_patched=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for visibility support. Disabling -fvisibility=hidden" >&5 echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for @@ -32660,16 +33010,15 @@ kde_have_gcc_visibility=no -echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5 -echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5 +echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; } kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -32696,34 +33045,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -32736,28 +33083,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : kde_have_gcc_visibility=yes - # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given. + # Check whether --enable-gcc-hidden-visibility was given. if test "${enable_gcc_hidden_visibility+set}" = set; then - enableval="$enable_gcc_hidden_visibility" - kde_have_gcc_visibility=$enableval + enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval else kde_have_gcc_visibility=no -fi; +fi + - echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5 -echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5 +echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; } if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -32792,35 +33138,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_val_qt_gcc_visibility_patched=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_val_qt_gcc_visibility_patched=yes + kde_cv_val_qt_gcc_visibility_patched=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS=$safe_CXXFLAGS ac_ext=c @@ -32832,21 +33174,20 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5 -echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5 +echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; } if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then CXXFLAGS="$CXXFLAGS -fvisibility=hidden" - echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5 -echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5 +echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; } if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -32886,35 +33227,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_val_gcc_visibility_bug=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_val_gcc_visibility_bug=yes + kde_cv_val_gcc_visibility_bug=yes fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS=$safe_CXXFLAGS @@ -32928,8 +33266,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5 -echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5 +echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; } if test x$kde_cv_val_gcc_visibility_bug = xno; then CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" @@ -32945,8 +33283,8 @@ fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -32959,10 +33297,9 @@ want_pam= -# Check whether --with-pam or --without-pam was given. +# Check whether --with-pam was given. if test "${with_pam+set}" = set; then - withval="$with_pam" - if test "x$withval" = "xyes"; then + withval=$with_pam; if test "x$withval" = "xyes"; then want_pam=yes pam_service=kde elif test "x$withval" = "xno"; then @@ -32974,13 +33311,14 @@ else pam_service=kde -fi; +fi + use_pam= PAMLIBS= if test "x$want_pam" != xno; then - echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 -echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 +echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; } if test "${ac_cv_lib_pam_pam_start+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32993,70 +33331,67 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pam_start (); int main () { -pam_start (); +return pam_start (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_pam_pam_start=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pam_pam_start=no + ac_cv_lib_pam_pam_start=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 +echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; } if test $ac_cv_lib_pam_pam_start = yes; then if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } if test "${ac_cv_header_security_pam_appl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 -echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 +echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33067,41 +33402,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 -echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 +echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33110,24 +33441,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -33135,9 +33464,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -33161,42 +33491,35 @@ echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } if test "${ac_cv_header_security_pam_appl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_security_pam_appl_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } fi if test $ac_cv_header_security_pam_appl_h = yes; then pam_header=security/pam_appl.h else if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then - echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5 -echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5 +echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; } if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5 -echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5 +echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33207,41 +33530,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5 -echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5 +echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33250,24 +33569,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -33275,9 +33592,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -33301,25 +33619,18 @@ echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5 -echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5 +echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; } if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_pam_pam_appl_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; } fi if test $ac_cv_header_pam_pam_appl_h = yes; then @@ -33366,8 +33677,8 @@ fi - echo "$as_me:$LINENO: checking for const pam_message" >&5 -echo $ECHO_N "checking for const pam_message... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for const pam_message" >&5 +echo $ECHO_N "checking for const pam_message... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33390,11 +33701,11 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "const struct pam_message" >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: const: Linux-type PAM" >&5 -echo "${ECHO_T}const: Linux-type PAM" >&6 + { echo "$as_me:$LINENO: result: const: Linux-type PAM" >&5 +echo "${ECHO_T}const: Linux-type PAM" >&6; } else - echo "$as_me:$LINENO: result: nonconst: Sun-type PAM" >&5 -echo "${ECHO_T}nonconst: Sun-type PAM" >&6 + { echo "$as_me:$LINENO: result: nonconst: Sun-type PAM" >&5 +echo "${ECHO_T}nonconst: Sun-type PAM" >&6; } cat >>confdefs.h <<\_ACEOF #define PAM_MESSAGE_NONCONST 1 @@ -33405,8 +33716,8 @@ rm -f conftest* else - echo "$as_me:$LINENO: result: not found - assume const, Linux-type PAM" >&5 -echo "${ECHO_T}not found - assume const, Linux-type PAM" >&6 + { echo "$as_me:$LINENO: result: not found - assume const, Linux-type PAM" >&5 +echo "${ECHO_T}not found - assume const, Linux-type PAM" >&6; } fi rm -f conftest* @@ -33418,8 +33729,8 @@ - echo "$as_me:$LINENO: checking for getspent in -lshadow" >&5 -echo $ECHO_N "checking for getspent in -lshadow... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for getspent in -lshadow" >&5 +echo $ECHO_N "checking for getspent in -lshadow... $ECHO_C" >&6; } if test "${ac_cv_lib_shadow_getspent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33432,63 +33743,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getspent (); int main () { -getspent (); +return getspent (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_shadow_getspent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_shadow_getspent=no + ac_cv_lib_shadow_getspent=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_shadow_getspent" >&5 -echo "${ECHO_T}$ac_cv_lib_shadow_getspent" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_shadow_getspent" >&5 +echo "${ECHO_T}$ac_cv_lib_shadow_getspent" >&6; } if test $ac_cv_lib_shadow_getspent = yes; then LIBSHADOW="-lshadow" ac_use_shadow=yes else - echo "$as_me:$LINENO: checking for getspent in -lgen" >&5 -echo $ECHO_N "checking for getspent in -lgen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for getspent in -lgen" >&5 +echo $ECHO_N "checking for getspent in -lgen... $ECHO_C" >&6; } if test "${ac_cv_lib_gen_getspent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33501,63 +33809,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getspent (); int main () { -getspent (); +return getspent (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_gen_getspent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_gen_getspent=no + ac_cv_lib_gen_getspent=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspent" >&5 -echo "${ECHO_T}$ac_cv_lib_gen_getspent" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspent" >&5 +echo "${ECHO_T}$ac_cv_lib_gen_getspent" >&6; } if test $ac_cv_lib_gen_getspent = yes; then LIBGEN="-lgen" ac_use_shadow=yes else - echo "$as_me:$LINENO: checking for getspent" >&5 -echo $ECHO_N "checking for getspent... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for getspent" >&5 +echo $ECHO_N "checking for getspent... $ECHO_C" >&6; } if test "${ac_cv_func_getspent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33584,68 +33889,59 @@ #undef getspent -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getspent (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_getspent) || defined (__stub___getspent) +#if defined __stub_getspent || defined __stub___getspent choke me -#else -char (*f) () = getspent; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != getspent; +return getspent (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_getspent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_getspent=no + ac_cv_func_getspent=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getspent" >&5 -echo "${ECHO_T}$ac_cv_func_getspent" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getspent" >&5 +echo "${ECHO_T}$ac_cv_func_getspent" >&6; } if test $ac_cv_func_getspent = yes; then ac_use_shadow=yes else @@ -33661,14 +33957,13 @@ - echo "$as_me:$LINENO: checking for shadow passwords" >&5 -echo $ECHO_N "checking for shadow passwords... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shadow passwords" >&5 +echo $ECHO_N "checking for shadow passwords... $ECHO_C" >&6; } -# Check whether --with-shadow or --without-shadow was given. +# Check whether --with-shadow was given. if test "${with_shadow+set}" = set; then - withval="$with_shadow" - if test "x$withval" != "xno"; then + withval=$with_shadow; if test "x$withval" != "xno"; then use_shadow=yes else use_shadow=no @@ -33678,19 +33973,20 @@ use_shadow="$ac_use_shadow" -fi; +fi + if test "x$use_shadow" = xyes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_SHADOW 1 _ACEOF else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBSHADOW= LIBGEN= fi @@ -33730,10 +34026,9 @@ -# Check whether --with-kdm-pam or --without-kdm-pam was given. +# Check whether --with-kdm-pam was given. if test "${with_kdm_pam+set}" = set; then - withval="$with_kdm_pam" - if test "x$use_pam" = xyes; then + withval=$with_kdm_pam; if test "x$use_pam" = xyes; then KDM_PAM_SERVICE=$withval else { { echo "$as_me:$LINENO: error: Cannot use use --with-kdm-pam, as no PAM was detected. @@ -33748,10 +34043,11 @@ KDM_PAM_SERVICE="$pam_service" fi -fi; +fi + if test -n "$KDM_PAM_SERVICE"; then - echo "$as_me:$LINENO: result: The PAM service used by kdm will be $KDM_PAM_SERVICE" >&5 -echo "${ECHO_T}The PAM service used by kdm will be $KDM_PAM_SERVICE" >&6 + { echo "$as_me:$LINENO: result: The PAM service used by kdm will be $KDM_PAM_SERVICE" >&5 +echo "${ECHO_T}The PAM service used by kdm will be $KDM_PAM_SERVICE" >&6; } cat >>confdefs.h <<_ACEOF #define KDM_PAM_SERVICE "$KDM_PAM_SERVICE" @@ -33762,10 +34058,9 @@ -# Check whether --with-kcp-pam or --without-kcp-pam was given. +# Check whether --with-kcp-pam was given. if test "${with_kcp_pam+set}" = set; then - withval="$with_kcp_pam" - if test "x$use_pam" = xyes; then + withval=$with_kcp_pam; if test "x$use_pam" = xyes; then KCHECKPASS_PAM_SERVICE=$withval else { { echo "$as_me:$LINENO: error: Cannot use use --with-kcp-pam, as no PAM was detected. @@ -33780,10 +34075,11 @@ KCHECKPASS_PAM_SERVICE="$pam_service" fi -fi; +fi + if test -n "$KCHECKPASS_PAM_SERVICE"; then - echo "$as_me:$LINENO: result: The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&5 -echo "${ECHO_T}The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&6 + { echo "$as_me:$LINENO: result: The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&5 +echo "${ECHO_T}The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&6; } cat >>confdefs.h <<_ACEOF #define KCHECKPASS_PAM_SERVICE "$KCHECKPASS_PAM_SERVICE" @@ -33794,10 +34090,9 @@ -# Check whether --with-kss-pam or --without-kss-pam was given. +# Check whether --with-kss-pam was given. if test "${with_kss_pam+set}" = set; then - withval="$with_kss_pam" - if test "x$use_pam" = xyes; then + withval=$with_kss_pam; if test "x$use_pam" = xyes; then KSCREENSAVER_PAM_SERVICE=$withval else { { echo "$as_me:$LINENO: error: Cannot use use --with-kss-pam, as no PAM was detected. @@ -33812,10 +34107,11 @@ KSCREENSAVER_PAM_SERVICE="$pam_service" fi -fi; +fi + if test -n "$KSCREENSAVER_PAM_SERVICE"; then - echo "$as_me:$LINENO: result: The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&5 -echo "${ECHO_T}The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&6 + { echo "$as_me:$LINENO: result: The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&5 +echo "${ECHO_T}The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&6; } cat >>confdefs.h <<_ACEOF #define KSCREENSAVER_PAM_SERVICE "$KSCREENSAVER_PAM_SERVICE" @@ -33833,9 +34129,9 @@ ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33857,38 +34153,35 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 @@ -33900,13 +34193,12 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33914,126 +34206,83 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34041,122 +34290,80 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in x; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34180,35 +34387,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -34264,6 +34467,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -34283,18 +34487,27 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -34307,12 +34520,14 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -34365,18 +34580,19 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34387,41 +34603,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34430,24 +34642,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -34455,9 +34665,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -34481,25 +34692,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -34512,17 +34717,17 @@ done if test "${ac_cv_header_pty_h+set}" = set; then - echo "$as_me:$LINENO: checking for pty.h" >&5 -echo $ECHO_N "checking for pty.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pty.h" >&5 +echo $ECHO_N "checking for pty.h... $ECHO_C" >&6; } if test "${ac_cv_header_pty_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5 -echo "${ECHO_T}$ac_cv_header_pty_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5 +echo "${ECHO_T}$ac_cv_header_pty_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking pty.h usability" >&5 -echo $ECHO_N "checking pty.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking pty.h usability" >&5 +echo $ECHO_N "checking pty.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34533,41 +34738,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking pty.h presence" >&5 -echo $ECHO_N "checking pty.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking pty.h presence" >&5 +echo $ECHO_N "checking pty.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34576,24 +34777,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -34601,9 +34800,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -34627,31 +34827,24 @@ echo "$as_me: WARNING: pty.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: pty.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: pty.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for pty.h" >&5 -echo $ECHO_N "checking for pty.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pty.h" >&5 +echo $ECHO_N "checking for pty.h... $ECHO_C" >&6; } if test "${ac_cv_header_pty_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_pty_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5 -echo "${ECHO_T}$ac_cv_header_pty_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5 +echo "${ECHO_T}$ac_cv_header_pty_h" >&6; } fi -echo "$as_me:$LINENO: checking for ptsname" >&5 -echo $ECHO_N "checking for ptsname... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ptsname" >&5 +echo $ECHO_N "checking for ptsname... $ECHO_C" >&6; } if test "${ac_cv_func_ptsname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34678,73 +34871,64 @@ #undef ptsname -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char ptsname (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_ptsname) || defined (__stub___ptsname) +#if defined __stub_ptsname || defined __stub___ptsname choke me -#else -char (*f) () = ptsname; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != ptsname; +return ptsname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_ptsname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_ptsname=no + ac_cv_func_ptsname=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_ptsname" >&5 -echo "${ECHO_T}$ac_cv_func_ptsname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_ptsname" >&5 +echo "${ECHO_T}$ac_cv_func_ptsname" >&6; } -echo "$as_me:$LINENO: checking for main in -lAlib" >&5 -echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -lAlib" >&5 +echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6; } if test "${ac_cv_lib_Alib_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34761,53 +34945,50 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Alib_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Alib_main=no + ac_cv_lib_Alib_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_main" >&5 -echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_main" >&5 +echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6; } if test $ac_cv_lib_Alib_main = yes; then LIBALIB="-lAlib" fi -echo "$as_me:$LINENO: checking for clnttcp_create" >&5 -echo $ECHO_N "checking for clnttcp_create... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for clnttcp_create" >&5 +echo $ECHO_N "checking for clnttcp_create... $ECHO_C" >&6; } if test "${ac_cv_func_clnttcp_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34834,74 +35015,65 @@ #undef clnttcp_create -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char clnttcp_create (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_clnttcp_create) || defined (__stub___clnttcp_create) +#if defined __stub_clnttcp_create || defined __stub___clnttcp_create choke me -#else -char (*f) () = clnttcp_create; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != clnttcp_create; +return clnttcp_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_clnttcp_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_clnttcp_create=no + ac_cv_func_clnttcp_create=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_clnttcp_create" >&5 -echo "${ECHO_T}$ac_cv_func_clnttcp_create" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_clnttcp_create" >&5 +echo "${ECHO_T}$ac_cv_func_clnttcp_create" >&6; } if test $ac_cv_func_clnttcp_create = yes; then : else - echo "$as_me:$LINENO: checking for clnttcp_create in -lnsl" >&5 -echo $ECHO_N "checking for clnttcp_create in -lnsl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for clnttcp_create in -lnsl" >&5 +echo $ECHO_N "checking for clnttcp_create in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_clnttcp_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34914,56 +35086,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char clnttcp_create (); int main () { -clnttcp_create (); +return clnttcp_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_nsl_clnttcp_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_clnttcp_create=no + ac_cv_lib_nsl_clnttcp_create=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_clnttcp_create" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_clnttcp_create" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_clnttcp_create" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_clnttcp_create" >&6; } if test $ac_cv_lib_nsl_clnttcp_create = yes; then LIBRPC="-lnsl" fi @@ -34972,8 +35141,8 @@ -echo "$as_me:$LINENO: checking for main in -lossaudio" >&5 -echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -lossaudio" >&5 +echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6; } if test "${ac_cv_lib_ossaudio_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34990,54 +35159,51 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ossaudio_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ossaudio_main=no + ac_cv_lib_ossaudio_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5 -echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5 +echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6; } if test $ac_cv_lib_ossaudio_main = yes; then LIBOSSAUDIO="-lossaudio" fi -echo "$as_me:$LINENO: checking for main in -lcfg" >&5 -echo $ECHO_N "checking for main in -lcfg... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -lcfg" >&5 +echo $ECHO_N "checking for main in -lcfg... $ECHO_C" >&6; } if test "${ac_cv_lib_cfg_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35054,52 +35220,49 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_cfg_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cfg_main=no + ac_cv_lib_cfg_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_cfg_main" >&5 -echo "${ECHO_T}$ac_cv_lib_cfg_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_cfg_main" >&5 +echo "${ECHO_T}$ac_cv_lib_cfg_main" >&6; } if test $ac_cv_lib_cfg_main = yes; then LIBCFG="-lcfg" fi -echo "$as_me:$LINENO: checking for main in -lodm" >&5 -echo $ECHO_N "checking for main in -lodm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -lodm" >&5 +echo $ECHO_N "checking for main in -lodm... $ECHO_C" >&6; } if test "${ac_cv_lib_odm_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35116,46 +35279,43 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_odm_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_odm_main=no + ac_cv_lib_odm_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_odm_main" >&5 -echo "${ECHO_T}$ac_cv_lib_odm_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_odm_main" >&5 +echo "${ECHO_T}$ac_cv_lib_odm_main" >&6; } if test $ac_cv_lib_odm_main = yes; then LIBODM="-lodm" fi @@ -35163,8 +35323,8 @@ kde_have_setupterm=yes -echo "$as_me:$LINENO: checking for setupterm in -lcurses" >&5 -echo $ECHO_N "checking for setupterm in -lcurses... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for setupterm in -lcurses" >&5 +echo $ECHO_N "checking for setupterm in -lcurses... $ECHO_C" >&6; } if test "${ac_cv_lib_curses_setupterm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35177,61 +35337,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char setupterm (); int main () { -setupterm (); +return setupterm (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_curses_setupterm=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_curses_setupterm=no + ac_cv_lib_curses_setupterm=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_curses_setupterm" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_setupterm" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_setupterm" >&5 +echo "${ECHO_T}$ac_cv_lib_curses_setupterm" >&6; } if test $ac_cv_lib_curses_setupterm = yes; then LIBCURSES=-lcurses else - echo "$as_me:$LINENO: checking for setupterm in -lncurses" >&5 -echo $ECHO_N "checking for setupterm in -lncurses... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for setupterm in -lncurses" >&5 +echo $ECHO_N "checking for setupterm in -lncurses... $ECHO_C" >&6; } if test "${ac_cv_lib_ncurses_setupterm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35244,61 +35401,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char setupterm (); int main () { -setupterm (); +return setupterm (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ncurses_setupterm=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ncurses_setupterm=no + ac_cv_lib_ncurses_setupterm=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_setupterm" >&5 -echo "${ECHO_T}$ac_cv_lib_ncurses_setupterm" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_setupterm" >&5 +echo "${ECHO_T}$ac_cv_lib_ncurses_setupterm" >&6; } if test $ac_cv_lib_ncurses_setupterm = yes; then LIBCURSES=-lncurses else - echo "$as_me:$LINENO: checking for setupterm in -lmytinfo" >&5 -echo $ECHO_N "checking for setupterm in -lmytinfo... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for setupterm in -lmytinfo" >&5 +echo $ECHO_N "checking for setupterm in -lmytinfo... $ECHO_C" >&6; } if test "${ac_cv_lib_mytinfo_setupterm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35311,56 +35465,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char setupterm (); int main () { -setupterm (); +return setupterm (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mytinfo_setupterm=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mytinfo_setupterm=no + ac_cv_lib_mytinfo_setupterm=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_setupterm" >&5 -echo "${ECHO_T}$ac_cv_lib_mytinfo_setupterm" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_setupterm" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_setupterm" >&6; } if test $ac_cv_lib_mytinfo_setupterm = yes; then LIBCURSES=-lmytinfo else @@ -35382,8 +35533,8 @@ fi -echo "$as_me:$LINENO: checking for res_init" >&5 -echo $ECHO_N "checking for res_init... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for res_init" >&5 +echo $ECHO_N "checking for res_init... $ECHO_C" >&6; } if test "${ac_cv_func_res_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35410,73 +35561,64 @@ #undef res_init -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char res_init (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_res_init) || defined (__stub___res_init) +#if defined __stub_res_init || defined __stub___res_init choke me -#else -char (*f) () = res_init; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != res_init; +return res_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_res_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_res_init=no + ac_cv_func_res_init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5 -echo "${ECHO_T}$ac_cv_func_res_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5 +echo "${ECHO_T}$ac_cv_func_res_init" >&6; } if test $ac_cv_func_res_init = yes; then : else - echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5 -echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5 +echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6; } if test "${ac_cv_lib_resolv_res_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35489,56 +35631,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char res_init (); int main () { -res_init (); +return res_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_resolv_res_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_resolv_res_init=no + ac_cv_lib_resolv_res_init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6; } if test $ac_cv_lib_resolv_res_init = yes; then LIBRESOLV="-lresolv" fi @@ -35547,7 +35686,7 @@ - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -35556,8 +35695,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35581,38 +35720,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_time=no + ac_cv_header_time=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF @@ -35635,9 +35770,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for working long double with more range or precision than double" >&5 -echo $ECHO_N "checking for working long double with more range or precision than double... $ECHO_C" >&6 -if test "${ac_cv_c_long_double+set}" = set; then + + + { echo "$as_me:$LINENO: checking for long double with more range or precision than double" >&5 +echo $ECHO_N "checking for long double with more range or precision than double... $ECHO_C" >&6; } +if test "${ac_cv_type_long_double_wider+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35647,13 +35784,27 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - long double foo = 0.0; + long double const a[] = + { + 0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON, + LDBL_MIN, LDBL_MAX, LDBL_EPSILON + }; + long double + f (long double x) + { + return ((x + (unsigned long int) 10) * (-1 / x) + a[0] + + (x ? f (x) : 'c')); + } + int main () { -static int test_array [1 - 2 * !(/* Using '|' rather than '||' catches a GCC 2.95.2 x86 bug. */ - (DBL_MAX < LDBL_MAX) | (LDBL_EPSILON < DBL_EPSILON) - | (DBL_MAX_EXP < LDBL_MAX_EXP) | (DBL_MANT_DIG < LDBL_MANT_DIG))]; +static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP) + + (DBL_MANT_DIG < LDBL_MANT_DIG) + - (LDBL_MAX_EXP < DBL_MAX_EXP) + - (LDBL_MANT_DIG < DBL_MANT_DIG))) + && (int) LDBL_EPSILON == 0 + )]; test_array [0] = 0 ; @@ -35661,48 +35812,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_long_double=yes + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_long_double_wider=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_long_double=no + ac_cv_type_long_double_wider=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_long_double" >&5 -echo "${ECHO_T}$ac_cv_c_long_double" >&6 -if test $ac_cv_c_long_double = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double_wider" >&5 +echo "${ECHO_T}$ac_cv_type_long_double_wider" >&6; } + if test $ac_cv_type_long_double_wider = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LONG_DOUBLE_WIDER 1 +_ACEOF + + fi + + ac_cv_c_long_double=$ac_cv_type_long_double_wider + if test $ac_cv_c_long_double = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_LONG_DOUBLE 1 _ACEOF -fi + fi -echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35724,8 +35880,8 @@ rm -f conftest* fi -echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\_ACEOF @@ -35739,8 +35895,8 @@ fi -echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5 -echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5 +echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; } if test "${ac_cv_type_getgroups+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35754,7 +35910,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Thanks to Mike Rendell for this test. */ -#include +$ac_includes_default #define NGID 256 #undef MAX #define MAX(x, y) ((x) > (y) ? (x) : (y)) @@ -35764,7 +35920,7 @@ { gid_t gidset[NGID]; int i, n; - union { gid_t gval; long lval; } val; + union { gid_t gval; long int lval; } val; val.lval = -1; for (i = 0; i < NGID; i++) @@ -35772,18 +35928,28 @@ n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1, gidset); /* Exit non-zero if getgroups seems to require an array of ints. This - happens when gid_t is short but getgroups modifies an array of ints. */ - exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0); + happens when gid_t is short int but getgroups modifies an array + of ints. */ + return n > 0 && gidset[n] != val.gval; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -35796,8 +35962,10 @@ ( exit $ac_status ) ac_cv_type_getgroups=int fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + if test $ac_cv_type_getgroups = cross; then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -35818,8 +35986,8 @@ fi fi -echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5 -echo "${ECHO_T}$ac_cv_type_getgroups" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5 +echo "${ECHO_T}$ac_cv_type_getgroups" >&6; } cat >>confdefs.h <<_ACEOF #define GETGROUPS_T $ac_cv_type_getgroups @@ -35827,8 +35995,8 @@ -echo "$as_me:$LINENO: checking for char" >&5 -echo $ECHO_N "checking for char... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for char" >&5 +echo $ECHO_N "checking for char... $ECHO_C" >&6; } if test "${ac_cv_type_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35839,61 +36007,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef char ac__type_new_; int main () { -if ((char *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (char)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_char=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char=no + ac_cv_type_char=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 +echo "${ECHO_T}$ac_cv_type_char" >&6; } -echo "$as_me:$LINENO: checking size of char" >&5 -echo $ECHO_N "checking size of char... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of char" >&5 +echo $ECHO_N "checking size of char... $ECHO_C" >&6; } if test "${ac_cv_sizeof_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_char" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -35903,10 +36067,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -35914,27 +36079,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -35944,10 +36104,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -35955,56 +36116,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -36012,27 +36170,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -36042,10 +36195,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -36053,50 +36207,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -36107,10 +36259,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -36118,52 +36271,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_char=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 +'') if test "$ac_cv_type_char" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 77 +echo "$as_me: error: cannot compute sizeof (char) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36171,8 +36317,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (char)); } -unsigned long ulongval () { return (long) (sizeof (char)); } + typedef char ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -36181,35 +36328,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (char))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (char)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (char)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -36220,29 +36376,32 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 +if test "$ac_cv_type_char" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 77 +echo "$as_me: error: cannot compute sizeof (char) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_char=0 fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR $ac_cv_sizeof_char _ACEOF -echo "$as_me:$LINENO: checking for short" >&5 -echo $ECHO_N "checking for short... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6; } if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -36253,61 +36412,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef short ac__type_new_; int main () { -if ((short *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (short)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_short=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_short=no + ac_cv_type_short=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 -echo "${ECHO_T}$ac_cv_type_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6; } -echo "$as_me:$LINENO: checking size of short" >&5 -echo $ECHO_N "checking size of short... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6; } if test "${ac_cv_sizeof_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_short" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -36317,10 +36472,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -36328,27 +36484,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -36358,10 +36509,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -36369,56 +36521,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -36426,27 +36575,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -36456,10 +36600,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -36467,50 +36612,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -36521,10 +36664,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -36532,52 +36676,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_short=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +'') if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36585,8 +36722,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (short)); } -unsigned long ulongval () { return (long) (sizeof (short)); } + typedef short ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -36595,35 +36733,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (short))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (short)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (short)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -36634,29 +36781,32 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_short=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short _ACEOF -echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6; } if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -36667,61 +36817,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef int ac__type_new_; int main () { -if ((int *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (int)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int=no + ac_cv_type_int=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6; } -echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; } if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_int" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -36731,10 +36877,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -36742,27 +36889,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -36772,10 +36914,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -36783,56 +36926,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -36840,27 +36980,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -36870,10 +37005,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -36881,50 +37017,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -36935,10 +37069,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -36946,52 +37081,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +'') if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36999,8 +37127,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (int)); } -unsigned long ulongval () { return (long) (sizeof (int)); } + typedef int ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -37009,35 +37138,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (int))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (int)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (int)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -37048,29 +37186,32 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_int=0 fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int _ACEOF -echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6; } if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -37081,61 +37222,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef long ac__type_new_; int main () { -if ((long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (long)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long=no + ac_cv_type_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6; } -echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -37145,10 +37282,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -37156,27 +37294,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -37186,10 +37319,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -37197,56 +37331,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -37254,27 +37385,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -37284,10 +37410,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -37295,50 +37422,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -37349,10 +37474,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -37360,52 +37486,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +'') if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -37413,8 +37532,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (long)); } -unsigned long ulongval () { return (long) (sizeof (long)); } + typedef long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -37423,35 +37543,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -37462,29 +37591,32 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_long=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF -echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } if test "${ac_cv_c_bigendian+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -37501,7 +37633,8 @@ int main () { -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ + && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) bogus endian macros #endif @@ -37510,27 +37643,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -37553,40 +37681,36 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -# It does not; compile a test program. + # It does not; compile a test program. if test "$cross_compiling" = yes; then # try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown @@ -37596,11 +37720,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } int main () @@ -37611,27 +37735,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes fi @@ -37647,8 +37766,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -37656,27 +37777,41 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default int main () { + /* Are we little or big endian? From Harbison&Steele. */ union { - long l; - char c[sizeof (long)]; + long int l; + char c[sizeof (long int)]; } u; u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -37689,13 +37824,16 @@ ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in yes) @@ -37737,9 +37875,9 @@ for ac_func in socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -37765,68 +37903,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -37837,15 +37967,14 @@ -echo "$as_me:$LINENO: checking for mkstemps" >&5 -echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mkstemps" >&5 +echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6; } if test "${kde_cv_func_mkstemps+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -37857,9 +37986,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -37885,35 +38011,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_mkstemps=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_mkstemps=no + kde_cv_func_mkstemps=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -37926,11 +38048,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5 -echo "${ECHO_T}$kde_cv_func_mkstemps" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5 +echo "${ECHO_T}$kde_cv_func_mkstemps" >&6; } -echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5 -echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5 +echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_mkstemps+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -37951,8 +38073,7 @@ if test "x$kde_cv_proto_mkstemps" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -37990,37 +38111,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_mkstemps=yes kde_cv_proto_mkstemps=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_mkstemps="mkstemps unavailable" + kde_cv_proto_mkstemps="mkstemps unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -38033,8 +38151,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5 -echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5 +echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6; } if test "x$kde_cv_func_mkstemps" = xyes; then @@ -38058,15 +38176,14 @@ -echo "$as_me:$LINENO: checking for setenv" >&5 -echo $ECHO_N "checking for setenv... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for setenv" >&5 +echo $ECHO_N "checking for setenv... $ECHO_C" >&6; } if test "${kde_cv_func_setenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38078,9 +38195,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -38103,35 +38217,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_setenv=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_setenv=no + kde_cv_func_setenv=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -38144,11 +38254,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5 -echo "${ECHO_T}$kde_cv_func_setenv" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5 +echo "${ECHO_T}$kde_cv_func_setenv" >&6; } -echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5 -echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5 +echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_setenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38169,8 +38279,7 @@ if test "x$kde_cv_proto_setenv" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38205,37 +38314,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_setenv=yes kde_cv_proto_setenv=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_setenv="setenv unavailable" + kde_cv_proto_setenv="setenv unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -38248,8 +38354,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5 -echo "${ECHO_T}$kde_cv_proto_setenv" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5 +echo "${ECHO_T}$kde_cv_proto_setenv" >&6; } if test "x$kde_cv_func_setenv" = xyes; then @@ -38273,15 +38379,14 @@ -echo "$as_me:$LINENO: checking for unsetenv" >&5 -echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for unsetenv" >&5 +echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; } if test "${kde_cv_func_unsetenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38293,9 +38398,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -38318,35 +38420,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_unsetenv=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_unsetenv=no + kde_cv_func_unsetenv=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -38359,11 +38457,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5 -echo "${ECHO_T}$kde_cv_func_unsetenv" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5 +echo "${ECHO_T}$kde_cv_func_unsetenv" >&6; } -echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5 -echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5 +echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_unsetenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38384,8 +38482,7 @@ if test "x$kde_cv_proto_unsetenv" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38420,37 +38517,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_unsetenv=yes kde_cv_proto_unsetenv=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_unsetenv="unsetenv unavailable" + kde_cv_proto_unsetenv="unsetenv unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -38463,8 +38557,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5 -echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5 +echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6; } if test "x$kde_cv_func_unsetenv" = xyes; then @@ -38488,15 +38582,14 @@ -echo "$as_me:$LINENO: checking for getdomainname" >&5 -echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for getdomainname" >&5 +echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6; } if test "${kde_cv_func_getdomainname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38508,9 +38601,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -38538,35 +38628,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_getdomainname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_getdomainname=no + kde_cv_func_getdomainname=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -38579,11 +38665,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5 -echo "${ECHO_T}$kde_cv_func_getdomainname" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5 +echo "${ECHO_T}$kde_cv_func_getdomainname" >&6; } -echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5 -echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5 +echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_getdomainname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38604,8 +38690,7 @@ if test "x$kde_cv_proto_getdomainname" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38646,37 +38731,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_getdomainname=yes kde_cv_proto_getdomainname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_getdomainname="getdomainname unavailable" + kde_cv_proto_getdomainname="getdomainname unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -38689,8 +38771,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5 -echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5 +echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6; } if test "x$kde_cv_func_getdomainname" = xyes; then @@ -38714,15 +38796,14 @@ -echo "$as_me:$LINENO: checking for gethostname" >&5 -echo $ECHO_N "checking for gethostname... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for gethostname" >&5 +echo $ECHO_N "checking for gethostname... $ECHO_C" >&6; } if test "${kde_cv_func_gethostname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38734,9 +38815,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -38763,35 +38841,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_gethostname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_gethostname=no + kde_cv_func_gethostname=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -38804,11 +38878,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5 -echo "${ECHO_T}$kde_cv_func_gethostname" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5 +echo "${ECHO_T}$kde_cv_func_gethostname" >&6; } -echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5 -echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5 +echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_gethostname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38829,8 +38903,7 @@ if test "x$kde_cv_proto_gethostname" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38869,37 +38942,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_gethostname=yes kde_cv_proto_gethostname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_gethostname="gethostname unavailable" + kde_cv_proto_gethostname="gethostname unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -38912,8 +38982,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5 -echo "${ECHO_T}$kde_cv_proto_gethostname" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5 +echo "${ECHO_T}$kde_cv_proto_gethostname" >&6; } if test "x$kde_cv_func_gethostname" = xyes; then @@ -38937,15 +39007,14 @@ -echo "$as_me:$LINENO: checking for usleep" >&5 -echo $ECHO_N "checking for usleep... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for usleep" >&5 +echo $ECHO_N "checking for usleep... $ECHO_C" >&6; } if test "${kde_cv_func_usleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -38957,9 +39026,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -38984,35 +39050,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_usleep=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_usleep=no + kde_cv_func_usleep=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -39025,11 +39087,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5 -echo "${ECHO_T}$kde_cv_func_usleep" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5 +echo "${ECHO_T}$kde_cv_func_usleep" >&6; } -echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5 -echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5 +echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_usleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -39050,8 +39112,7 @@ if test "x$kde_cv_proto_usleep" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -39088,37 +39149,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_usleep=yes kde_cv_proto_usleep=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_usleep="usleep unavailable" + kde_cv_proto_usleep="usleep unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -39131,8 +39189,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5 -echo "${ECHO_T}$kde_cv_proto_usleep" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5 +echo "${ECHO_T}$kde_cv_proto_usleep" >&6; } if test "x$kde_cv_func_usleep" = xyes; then @@ -39156,15 +39214,14 @@ -echo "$as_me:$LINENO: checking for random" >&5 -echo $ECHO_N "checking for random... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for random" >&5 +echo $ECHO_N "checking for random... $ECHO_C" >&6; } if test "${kde_cv_func_random+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -39176,9 +39233,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -39203,35 +39257,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_random=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_random=no + kde_cv_func_random=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -39244,11 +39294,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5 -echo "${ECHO_T}$kde_cv_func_random" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5 +echo "${ECHO_T}$kde_cv_func_random" >&6; } -echo "$as_me:$LINENO: checking if random needs custom prototype" >&5 -echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if random needs custom prototype" >&5 +echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_random+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -39269,8 +39319,7 @@ if test "x$kde_cv_proto_random" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -39307,37 +39356,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_random=yes kde_cv_proto_random=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_random="random unavailable" + kde_cv_proto_random="random unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -39350,8 +39396,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5 -echo "${ECHO_T}$kde_cv_proto_random" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5 +echo "${ECHO_T}$kde_cv_proto_random" >&6; } if test "x$kde_cv_func_random" = xyes; then @@ -39374,15 +39420,14 @@ -echo "$as_me:$LINENO: checking for srandom" >&5 -echo $ECHO_N "checking for srandom... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for srandom" >&5 +echo $ECHO_N "checking for srandom... $ECHO_C" >&6; } if test "${kde_cv_func_srandom+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -39394,9 +39439,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -39421,35 +39463,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_srandom=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_srandom=no + kde_cv_func_srandom=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -39462,11 +39500,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5 -echo "${ECHO_T}$kde_cv_func_srandom" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5 +echo "${ECHO_T}$kde_cv_func_srandom" >&6; } -echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5 -echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5 +echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_srandom+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -39487,8 +39525,7 @@ if test "x$kde_cv_proto_srandom" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -39525,37 +39562,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_srandom=yes kde_cv_proto_srandom=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_srandom="srandom unavailable" + kde_cv_proto_srandom="srandom unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -39568,8 +39602,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5 -echo "${ECHO_T}$kde_cv_proto_srandom" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5 +echo "${ECHO_T}$kde_cv_proto_srandom" >&6; } if test "x$kde_cv_func_srandom" = xyes; then @@ -39593,8 +39627,8 @@ -echo "$as_me:$LINENO: checking for S_ISSOCK" >&5 -echo $ECHO_N "checking for S_ISSOCK... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for S_ISSOCK" >&5 +echo $ECHO_N "checking for S_ISSOCK... $ECHO_C" >&6; } if test "${ac_cv_have_s_issock+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -39620,41 +39654,38 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_have_s_issock=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_s_issock=no + ac_cv_have_s_issock=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_s_issock" >&5 -echo "${ECHO_T}$ac_cv_have_s_issock" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_have_s_issock" >&5 +echo "${ECHO_T}$ac_cv_have_s_issock" >&6; } if test "$ac_cv_have_s_issock" = "yes"; then cat >>confdefs.h <<_ACEOF @@ -39668,8 +39699,8 @@ -echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5 -echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5 +echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6; } if test "${ac_cv_maxpathlen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -39705,16 +39736,16 @@ fi -echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5 -echo "${ECHO_T}$ac_cv_maxpathlen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5 +echo "${ECHO_T}$ac_cv_maxpathlen" >&6; } cat >>confdefs.h <<_ACEOF #define KDEMAXPATHLEN $ac_cv_maxpathlen _ACEOF -echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5 -echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5 +echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6; } case "$host_os" in linux*) utmp_support=yes; @@ -39726,8 +39757,8 @@ *) utmp_support=no; esac -echo "$as_me:$LINENO: result: $utmp_support" >&5 -echo "${ECHO_T}$utmp_support" >&6 +{ echo "$as_me:$LINENO: result: $utmp_support" >&5 +echo "${ECHO_T}$utmp_support" >&6; } if test "$utmp_support" = yes; then @@ -39738,8 +39769,8 @@ fi - echo "$as_me:$LINENO: checking for utmp file" >&5 -echo $ECHO_N "checking for utmp file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for utmp file" >&5 +echo $ECHO_N "checking for utmp file... $ECHO_C" >&6; } if test "${kde_cv_utmp_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -39770,18 +39801,18 @@ _ACEOF - echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5 -echo "${ECHO_T}$kde_cv_utmp_file" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5 +echo "${ECHO_T}$kde_cv_utmp_file" >&6; } else - echo "$as_me:$LINENO: result: non found" >&5 -echo "${ECHO_T}non found" >&6 + { echo "$as_me:$LINENO: result: non found" >&5 +echo "${ECHO_T}non found" >&6; } fi kde_have_kstat=yes -echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 -echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 +echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; } if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -39794,56 +39825,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char kstat_open (); int main () { -kstat_open (); +return kstat_open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_kstat_kstat_open=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_kstat_kstat_open=no + ac_cv_lib_kstat_kstat_open=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 -echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 +echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; } if test $ac_cv_lib_kstat_kstat_open = yes; then LIBKSTAT=-lkstat else @@ -39860,17 +39888,17 @@ fi if test "${ac_cv_header_libdevinfo_h+set}" = set; then - echo "$as_me:$LINENO: checking for libdevinfo.h" >&5 -echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libdevinfo.h" >&5 +echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6; } if test "${ac_cv_header_libdevinfo_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5 +echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking libdevinfo.h usability" >&5 -echo $ECHO_N "checking libdevinfo.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libdevinfo.h usability" >&5 +echo $ECHO_N "checking libdevinfo.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -39881,41 +39909,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking libdevinfo.h presence" >&5 -echo $ECHO_N "checking libdevinfo.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libdevinfo.h presence" >&5 +echo $ECHO_N "checking libdevinfo.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -39924,24 +39948,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -39949,9 +39971,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -39975,25 +39998,18 @@ echo "$as_me: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for libdevinfo.h" >&5 -echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libdevinfo.h" >&5 +echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6; } if test "${ac_cv_header_libdevinfo_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_libdevinfo_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5 -echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5 +echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6; } fi if test $ac_cv_header_libdevinfo_h = yes; then @@ -40005,8 +40021,8 @@ if test "$kde_have_libdevinfo_h" = "yes"; then kde_have_libdevinfo_lib=yes - echo "$as_me:$LINENO: checking for di_init in -ldevinfo" >&5 -echo $ECHO_N "checking for di_init in -ldevinfo... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for di_init in -ldevinfo" >&5 +echo $ECHO_N "checking for di_init in -ldevinfo... $ECHO_C" >&6; } if test "${ac_cv_lib_devinfo_di_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -40019,56 +40035,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char di_init (); int main () { -di_init (); +return di_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_devinfo_di_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_devinfo_di_init=no + ac_cv_lib_devinfo_di_init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_di_init" >&5 -echo "${ECHO_T}$ac_cv_lib_devinfo_di_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_di_init" >&5 +echo "${ECHO_T}$ac_cv_lib_devinfo_di_init" >&6; } if test $ac_cv_lib_devinfo_di_init = yes; then LIBDEVINFO=-ldevinfo else @@ -40088,18 +40101,18 @@ -# Check whether --with-java or --without-java was given. +# Check whether --with-java was given. if test "${with_java+set}" = set; then - withval="$with_java" - ac_java_dir=$withval + withval=$with_java; ac_java_dir=$withval else ac_java_dir="" -fi; +fi + -echo "$as_me:$LINENO: checking for Java" >&5 -echo $ECHO_N "checking for Java... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Java" >&5 +echo $ECHO_N "checking for Java... $ECHO_C" >&6; } if test "x$ac_java_dir" = "xno"; then kde_java_bindir=no @@ -40535,8 +40548,7 @@ if test -n "$jni_includes"; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -40570,35 +40582,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_jni_works=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - kde_jni_works=no + kde_jni_works=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $kde_jni_works = no; then { { echo "$as_me:$LINENO: error: Incorrect version of $kde_java_includedir/jni.h. @@ -40640,8 +40648,8 @@ else JVMLIBS="-L$kde_java_libgcjdir -lgcj" fi - echo "$as_me:$LINENO: result: java JDK in $kde_java_bindir" >&5 -echo "${ECHO_T}java JDK in $kde_java_bindir" >&6 + { echo "$as_me:$LINENO: result: java JDK in $kde_java_bindir" >&5 +echo "${ECHO_T}java JDK in $kde_java_bindir" >&6; } else @@ -40649,8 +40657,8 @@ #define PATH_JAVA "$kde_java_bindir/java" _ACEOF - echo "$as_me:$LINENO: result: java JRE in $kde_java_bindir" >&5 -echo "${ECHO_T}java JRE in $kde_java_bindir" >&6 + { echo "$as_me:$LINENO: result: java JRE in $kde_java_bindir" >&5 +echo "${ECHO_T}java JRE in $kde_java_bindir" >&6; } fi elif test -d "/Library/Java/Home"; then kde_java_bindir="/Library/Java/Home/bin" @@ -40666,11 +40674,11 @@ #define PATH_JAVA "$kde_java_bindir/java" _ACEOF - echo "$as_me:$LINENO: result: Apple Java Framework" >&5 -echo "${ECHO_T}Apple Java Framework" >&6 + { echo "$as_me:$LINENO: result: Apple Java Framework" >&5 +echo "${ECHO_T}Apple Java Framework" >&6; } else - echo "$as_me:$LINENO: result: none found" >&5 -echo "${ECHO_T}none found" >&6 + { echo "$as_me:$LINENO: result: none found" >&5 +echo "${ECHO_T}none found" >&6; } fi @@ -40689,8 +40697,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MD5SUM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -40705,35 +40713,36 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi MD5SUM=$ac_cv_path_MD5SUM - if test -n "$MD5SUM"; then - echo "$as_me:$LINENO: result: $MD5SUM" >&5 -echo "${ECHO_T}$MD5SUM" >&6 + { echo "$as_me:$LINENO: result: $MD5SUM" >&5 +echo "${ECHO_T}$MD5SUM" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$MD5SUM" && break done if test -z "$MD5SUM" ; then # Extract the first word of "md5", so it can be a program name with args. set dummy md5; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MD5SUM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -40748,32 +40757,33 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi MD5SUM=$ac_cv_path_MD5SUM - if test -n "$MD5SUM"; then - echo "$as_me:$LINENO: result: $MD5SUM" >&5 -echo "${ECHO_T}$MD5SUM" >&6 + { echo "$as_me:$LINENO: result: $MD5SUM" >&5 +echo "${ECHO_T}$MD5SUM" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test -z "$MD5SUM" ; then # Extract the first word of "md5", so it can be a program name with args. set dummy md5; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MD5SUM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -40788,27 +40798,28 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi MD5SUM=$ac_cv_path_MD5SUM - if test -n "$MD5SUM"; then - echo "$as_me:$LINENO: result: $MD5SUM" >&5 -echo "${ECHO_T}$MD5SUM" >&6 + { echo "$as_me:$LINENO: result: $MD5SUM" >&5 +echo "${ECHO_T}$MD5SUM" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$MD5SUM" ; then { echo "$as_me:$LINENO: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&5 @@ -40830,8 +40841,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -40841,17 +40851,17 @@ if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5 -echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5 +echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5 -echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5 +echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -40862,41 +40872,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5 -echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5 +echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -40905,24 +40911,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -40930,9 +40934,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -40956,30 +40961,23 @@ echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5 -echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5 +echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_XTest_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; } fi if test $ac_cv_header_X11_extensions_XTest_h = yes; then - echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5 -echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5 +echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6; } if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -40992,56 +40990,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XTestFakeKeyEvent (); int main () { -XTestFakeKeyEvent (); +return XTestFakeKeyEvent (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xtst_XTestFakeKeyEvent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xtst_XTestFakeKeyEvent=no + ac_cv_lib_Xtst_XTestFakeKeyEvent=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5 -echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5 +echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; } if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then cat >>confdefs.h <<\_ACEOF @@ -41069,8 +41064,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -41079,8 +41073,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5 -echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5 +echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41095,41 +41089,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_XKBlib_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_XKBlib_h=no + ac_cv_header_X11_XKBlib_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; } if test $ac_cv_header_X11_XKBlib_h = yes; then - echo "$as_me:$LINENO: checking for XkbLockModifiers in -lX11" >&5 -echo $ECHO_N "checking for XkbLockModifiers in -lX11... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XkbLockModifiers in -lX11" >&5 +echo $ECHO_N "checking for XkbLockModifiers in -lX11... $ECHO_C" >&6; } if test "${ac_cv_lib_X11_XkbLockModifiers+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41142,56 +41132,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XkbLockModifiers (); int main () { -XkbLockModifiers (); +return XkbLockModifiers (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_X11_XkbLockModifiers=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_X11_XkbLockModifiers=no + ac_cv_lib_X11_XkbLockModifiers=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbLockModifiers" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XkbLockModifiers" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbLockModifiers" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XkbLockModifiers" >&6; } if test $ac_cv_lib_X11_XkbLockModifiers = yes; then cat >>confdefs.h <<\_ACEOF @@ -41200,8 +41187,8 @@ fi - echo "$as_me:$LINENO: checking for XkbSetPerClientControls in -lX11" >&5 -echo $ECHO_N "checking for XkbSetPerClientControls in -lX11... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XkbSetPerClientControls in -lX11" >&5 +echo $ECHO_N "checking for XkbSetPerClientControls in -lX11... $ECHO_C" >&6; } if test "${ac_cv_lib_X11_XkbSetPerClientControls+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41214,56 +41201,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XkbSetPerClientControls (); int main () { -XkbSetPerClientControls (); +return XkbSetPerClientControls (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_X11_XkbSetPerClientControls=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_X11_XkbSetPerClientControls=no + ac_cv_lib_X11_XkbSetPerClientControls=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbSetPerClientControls" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XkbSetPerClientControls" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbSetPerClientControls" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XkbSetPerClientControls" >&6; } if test $ac_cv_lib_X11_XkbSetPerClientControls = yes; then cat >>confdefs.h <<\_ACEOF @@ -41289,10 +41273,9 @@ - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -41305,9 +41288,9 @@ for ac_header in X11/Xcursor/Xcursor.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -41321,38 +41304,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -41366,8 +41346,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for XcursorSupportsARGB in -lXcursor" >&5 -echo $ECHO_N "checking for XcursorSupportsARGB in -lXcursor... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XcursorSupportsARGB in -lXcursor" >&5 +echo $ECHO_N "checking for XcursorSupportsARGB in -lXcursor... $ECHO_C" >&6; } if test "${ac_cv_lib_Xcursor_XcursorSupportsARGB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41380,56 +41360,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XcursorSupportsARGB (); int main () { -XcursorSupportsARGB (); +return XcursorSupportsARGB (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xcursor_XcursorSupportsARGB=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xcursor_XcursorSupportsARGB=no + ac_cv_lib_Xcursor_XcursorSupportsARGB=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xcursor_XcursorSupportsARGB" >&5 -echo "${ECHO_T}$ac_cv_lib_Xcursor_XcursorSupportsARGB" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcursor_XcursorSupportsARGB" >&5 +echo "${ECHO_T}$ac_cv_lib_Xcursor_XcursorSupportsARGB" >&6; } if test $ac_cv_lib_Xcursor_XcursorSupportsARGB = yes; then LIB_XCURSOR=-lXcursor @@ -41475,8 +41452,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -41486,17 +41462,17 @@ if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41507,41 +41483,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41550,24 +41522,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -41575,9 +41545,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -41601,25 +41572,18 @@ echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } fi if test $ac_cv_header_X11_extensions_Xrender_h = yes; then @@ -41647,8 +41611,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5 -echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5 +echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6; } if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41661,56 +41625,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XRenderComposite (); int main () { -XRenderComposite (); +return XRenderComposite (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xrender_XRenderComposite=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrender_XRenderComposite=no + ac_cv_lib_Xrender_XRenderComposite=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6; } if test $ac_cv_lib_Xrender_XRenderComposite = yes; then LIB_XRENDER=-lXrender @@ -41735,8 +41696,8 @@ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" -echo "$as_me:$LINENO: checking for Qt docs" >&5 -echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Qt docs" >&5 +echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; } kde_qtdir= if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" @@ -41748,7 +41709,7 @@ do for j in qsql.html; do - echo "configure: 41751: $i/$j" >&5 + echo "configure: 41712: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 QTDOCDIR=$i @@ -41757,20 +41718,20 @@ done done -echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 -echo "${ECHO_T}$QTDOCDIR" >&6 +{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 +echo "${ECHO_T}$QTDOCDIR" >&6; } - echo "$as_me:$LINENO: checking for dot" >&5 -echo $ECHO_N "checking for dot... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dot" >&5 +echo $ECHO_N "checking for dot... $ECHO_C" >&6; } if test -n "$DOT"; then kde_cv_path="$DOT"; else kde_cache=`echo dot | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41813,12 +41774,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DOT=$kde_cv_path fi @@ -41830,14 +41791,14 @@ fi - echo "$as_me:$LINENO: checking for doxygen" >&5 -echo $ECHO_N "checking for doxygen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for doxygen" >&5 +echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; } if test -n "$DOXYGEN"; then kde_cv_path="$DOXYGEN"; else kde_cache=`echo doxygen | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -41880,12 +41841,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DOXYGEN=$kde_cv_path fi @@ -41951,14 +41912,14 @@ - echo "$as_me:$LINENO: checking for libart2-config" >&5 -echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libart2-config" >&5 +echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6; } if test -n "$LIBART_CONFIG"; then kde_cv_path="$LIBART_CONFIG"; else kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -42001,15 +41962,15 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5 echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;} else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } LIBART_CONFIG=$kde_cv_path fi @@ -42048,11 +42009,11 @@ -# Check whether --with-composite or --without-composite was given. +# Check whether --with-composite was given. if test "${with_composite+set}" = set; then - withval="$with_composite" + withval=$with_composite; +fi -fi; if test -z "$RUN_KAPPFINDER"; then @@ -42065,8 +42026,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -42075,8 +42035,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 -echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -42093,38 +42053,34 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_XKBstr_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_XKBstr_h=no + ac_cv_header_X11_extensions_XKBstr_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; } if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then ACCESS_SUBDIR=access fi @@ -42155,8 +42111,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -42166,17 +42121,17 @@ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 -echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h usability" >&5 -echo $ECHO_N "checking X11/extensions/XKBstr.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h usability" >&5 +echo $ECHO_N "checking X11/extensions/XKBstr.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -42187,41 +42142,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h presence" >&5 -echo $ECHO_N "checking X11/extensions/XKBstr.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h presence" >&5 +echo $ECHO_N "checking X11/extensions/XKBstr.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -42230,24 +42181,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -42255,9 +42204,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -42281,25 +42231,18 @@ echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 -echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_XKBstr_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; } fi if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then @@ -42334,26 +42277,26 @@ ssl_libraries="" ssl_includes="" -# Check whether --with-ssl-dir or --without-ssl-dir was given. +# Check whether --with-ssl-dir was given. if test "${with_ssl_dir+set}" = set; then - withval="$with_ssl_dir" - ac_ssl_includes="$withval"/include + withval=$with_ssl_dir; ac_ssl_includes="$withval"/include ac_ssl_libraries="$withval"/lib$kdelibsuff -fi; +fi + want_ssl=yes -# Check whether --with-ssl or --without-ssl was given. +# Check whether --with-ssl was given. if test "${with_ssl+set}" = set; then - withval="$with_ssl" - want_ssl=$withval -fi; + withval=$with_ssl; want_ssl=$withval +fi + if test $want_ssl = yes; then -echo "$as_me:$LINENO: checking for OpenSSL" >&5 -echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for OpenSSL" >&5 +echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; } if test "${ac_cv_have_ssl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -42368,7 +42311,7 @@ do for j in openssl/ssl.h; do - echo "configure: 42371: $i/$j" >&5 + echo "configure: 42314: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ssl_incdir=$i @@ -42415,37 +42358,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_ssl_rsaref="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_ssl_rsaref="no" + ac_ssl_rsaref="no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$ac_ldflags_safe" @@ -42463,26 +42403,26 @@ eval "$ac_cv_have_ssl" - echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5 -echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6 + { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5 +echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; } - echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5 -echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5 -echo "${ECHO_T}$ac_ssl_rsaref" >&6 - - echo "$as_me:$LINENO: checking for easter eggs" >&5 -echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: none found" >&5 -echo "${ECHO_T}none found" >&6 + { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5 +echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5 +echo "${ECHO_T}$ac_ssl_rsaref" >&6; } + + { echo "$as_me:$LINENO: checking for easter eggs" >&5 +echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: none found" >&5 +echo "${ECHO_T}none found" >&6; } else have_ssl=no fi if test "$have_ssl" = yes; then - echo "$as_me:$LINENO: checking for OpenSSL version" >&5 -echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for OpenSSL version" >&5 +echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; } if test "${ac_cv_ssl_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -42555,8 +42495,8 @@ eval "$ac_cv_ssl_version" - echo "$as_me:$LINENO: result: $ssl_version" >&5 -echo "${ECHO_T}$ssl_version" >&6 + { echo "$as_me:$LINENO: result: $ssl_version" >&5 +echo "${ECHO_T}$ssl_version" >&6; } fi if test "$have_ssl" != yes; then @@ -42615,25 +42555,25 @@ DPMS_LIB= -# Check whether --with-dpms or --without-dpms was given. +# Check whether --with-dpms was given. if test "${with_dpms+set}" = set; then - withval="$with_dpms" - dpms_test=$withval + withval=$with_dpms; dpms_test=$withval else dpms_test="yes" -fi; +fi + if test "x$dpms_test" = xno; then ac_cv_have_dpms=no else - echo "$as_me:$LINENO: checking for DPMS" >&5 -echo $ECHO_N "checking for DPMS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for DPMS" >&5 +echo $ECHO_N "checking for DPMS... $ECHO_C" >&6; } if test "${ac_cv_have_dpms+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ac_cv_have_dpms="no" else ac_save_ldflags="$LDFLAGS" @@ -42665,27 +42605,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_have_dpms="yes" else echo "$as_me: failed program was:" >&5 @@ -42715,27 +42651,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_have_dpms="-lXdpms" @@ -42743,13 +42675,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_dpms="no" + ac_cv_have_dpms="no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$ac_save_ldflags" CFLAGS="$ac_save_cflags" @@ -42759,8 +42693,8 @@ fi if test "$ac_cv_have_dpms" = no; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } DPMS_LDFLAGS="" DPMSINC="" @@ -42783,8 +42717,8 @@ else DPMSINC="-I$DPMS_INCLUDE" fi - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi fi @@ -42793,8 +42727,8 @@ test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" - echo "$as_me:$LINENO: checking whether DPMSCapable is declared" >&5 -echo $ECHO_N "checking whether DPMSCapable is declared... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether DPMSCapable is declared" >&5 +echo $ECHO_N "checking whether DPMSCapable is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -42811,7 +42745,7 @@ main () { #ifndef DPMSCapable - char *p = (char *) DPMSCapable; + (void) DPMSCapable; #endif ; @@ -42819,38 +42753,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_have_decl_DPMSCapable=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_DPMSCapable=no + ac_cv_have_decl_DPMSCapable=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSCapable" >&5 -echo "${ECHO_T}$ac_cv_have_decl_DPMSCapable" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSCapable" >&5 +echo "${ECHO_T}$ac_cv_have_decl_DPMSCapable" >&6; } if test $ac_cv_have_decl_DPMSCapable = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_DPMSCAPABLE_PROTO 1 @@ -42860,8 +42790,8 @@ - echo "$as_me:$LINENO: checking whether DPMSInfo is declared" >&5 -echo $ECHO_N "checking whether DPMSInfo is declared... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether DPMSInfo is declared" >&5 +echo $ECHO_N "checking whether DPMSInfo is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -42878,7 +42808,7 @@ main () { #ifndef DPMSInfo - char *p = (char *) DPMSInfo; + (void) DPMSInfo; #endif ; @@ -42886,38 +42816,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_have_decl_DPMSInfo=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_DPMSInfo=no + ac_cv_have_decl_DPMSInfo=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSInfo" >&5 -echo "${ECHO_T}$ac_cv_have_decl_DPMSInfo" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSInfo" >&5 +echo "${ECHO_T}$ac_cv_have_decl_DPMSInfo" >&6; } if test $ac_cv_have_decl_DPMSInfo = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_DPMSINFO_PROTO 1 @@ -42931,14 +42857,14 @@ - echo "$as_me:$LINENO: checking for fontconfig-config" >&5 -echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for fontconfig-config" >&5 +echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; } if test -n "$FONTCONFIG_CONFIG"; then kde_cv_path="$FONTCONFIG_CONFIG"; else kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -42981,18 +42907,18 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } - echo "$as_me:$LINENO: checking for pkg-config" >&5 -echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pkg-config" >&5 +echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; } if test -n "$PKGCONFIG"; then kde_cv_path="$PKGCONFIG"; else kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -43035,23 +42961,23 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5 echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;} else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } PKGCONFIG=$kde_cv_path fi else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } FONTCONFIG_CONFIG=$kde_cv_path fi @@ -43115,8 +43041,8 @@ case "$host" in *-*-osf*) - echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 -echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 +echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6; } if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -43129,56 +43055,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char vm_statistics (); int main () { -vm_statistics (); +return vm_statistics (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mach_vm_statistics=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mach_vm_statistics=no + ac_cv_lib_mach_vm_statistics=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5 -echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5 +echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6; } if test $ac_cv_lib_mach_vm_statistics = yes; then LIB_TRU64_MACH="-lmach" fi @@ -43189,18 +43112,19 @@ for ac_header in linux/raw.h sys/raw.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43211,41 +43135,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43254,24 +43174,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -43279,9 +43197,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -43305,25 +43224,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -43340,18 +43253,19 @@ for ac_header in devinfo.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43362,41 +43276,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -43405,24 +43315,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -43430,9 +43338,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -43456,25 +43365,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -43486,8 +43389,8 @@ done - echo "$as_me:$LINENO: checking for devinfo_foreach_rman in -ldevinfo" >&5 -echo $ECHO_N "checking for devinfo_foreach_rman in -ldevinfo... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for devinfo_foreach_rman in -ldevinfo" >&5 +echo $ECHO_N "checking for devinfo_foreach_rman in -ldevinfo... $ECHO_C" >&6; } if test "${ac_cv_lib_devinfo_devinfo_foreach_rman+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -43500,56 +43403,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char devinfo_foreach_rman (); int main () { -devinfo_foreach_rman (); +return devinfo_foreach_rman (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_devinfo_devinfo_foreach_rman=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_devinfo_devinfo_foreach_rman=no + ac_cv_lib_devinfo_devinfo_foreach_rman=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_devinfo_foreach_rman" >&5 -echo "${ECHO_T}$ac_cv_lib_devinfo_devinfo_foreach_rman" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_devinfo_foreach_rman" >&5 +echo "${ECHO_T}$ac_cv_lib_devinfo_devinfo_foreach_rman" >&6; } if test $ac_cv_lib_devinfo_devinfo_foreach_rman = yes; then LIBDEVINFO="-ldevinfo" fi @@ -43564,28 +43464,27 @@ test -z "$GL_INCLUDE" && GL_INCLUDE= -# Check whether --with-gl or --without-gl was given. +# Check whether --with-gl was given. if test "${with_gl+set}" = set; then - withval="$with_gl" - gl_test=$withval + withval=$with_gl; gl_test=$withval else gl_test="yes" -fi; +fi + if test "x$kde_use_qt_emb" = "xyes"; then # GL and Qt Embedded is a no-go for now. ac_cv_have_gl=no elif test "x$gl_test" = xno; then ac_cv_have_gl=no else - echo "$as_me:$LINENO: checking for GL" >&5 -echo $ECHO_N "checking for GL... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GL" >&5 +echo $ECHO_N "checking for GL... $ECHO_C" >&6; } if test "${ac_cv_have_gl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -43621,35 +43520,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_have_gl="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_gl="no" + ac_cv_have_gl="no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -43664,8 +43560,8 @@ fi if test "$ac_cv_have_gl" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } GL_LDFLAGS="" GLINC="" have_gl=no @@ -43685,8 +43581,8 @@ else GLINC="-I$GL_INCLUDE" fi - echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5 -echo "${ECHO_T}$ac_cv_have_gl" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5 +echo "${ECHO_T}$ac_cv_have_gl" >&6; } have_gl=yes fi fi @@ -43705,15 +43601,14 @@ -echo "$as_me:$LINENO: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6; } if test "${kde_cv_c_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -43741,35 +43636,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_c_long_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_c_long_long=no + kde_cv_c_long_long=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -43780,8 +43672,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5 -echo "${ECHO_T}$kde_cv_c_long_long" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5 +echo "${ECHO_T}$kde_cv_c_long_long" >&6; } if test "$kde_cv_c_long_long" = yes; then cat >>confdefs.h <<\_ACEOF @@ -43792,13 +43684,13 @@ -# Check whether --with-libusb or --without-libusb was given. +# Check whether --with-libusb was given. if test "${with_libusb+set}" = set; then - withval="$with_libusb" - + withval=$with_libusb; else with_libusb=check -fi; +fi + USB_LIBS= USB_CFLAGS= @@ -43806,8 +43698,8 @@ if test "x$with_libusb" != xno; then # Extract the first word of "libusb-config", so it can be a program name with args. set dummy libusb-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_LIBUSBCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -43822,34 +43714,35 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBUSBCONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_LIBUSBCONFIG" && ac_cv_path_LIBUSBCONFIG="no" ;; esac fi LIBUSBCONFIG=$ac_cv_path_LIBUSBCONFIG - if test -n "$LIBUSBCONFIG"; then - echo "$as_me:$LINENO: result: $LIBUSBCONFIG" >&5 -echo "${ECHO_T}$LIBUSBCONFIG" >&6 + { echo "$as_me:$LINENO: result: $LIBUSBCONFIG" >&5 +echo "${ECHO_T}$LIBUSBCONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test $LIBUSBCONFIG != "no"; then USB_LIBS="$($LIBUSBCONFIG --libs)" USB_CFLAGS="$($LIBUSBCONFIG --cflags)" - echo "$as_me:$LINENO: checking for main in -lusb" >&5 -echo $ECHO_N "checking for main in -lusb... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for main in -lusb" >&5 +echo $ECHO_N "checking for main in -lusb... $ECHO_C" >&6; } if test "${ac_cv_lib_usb_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -43867,46 +43760,43 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_usb_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_usb_main=no + ac_cv_lib_usb_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_usb_main" >&5 -echo "${ECHO_T}$ac_cv_lib_usb_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb_main" >&5 +echo "${ECHO_T}$ac_cv_lib_usb_main" >&6; } if test $ac_cv_lib_usb_main = yes; then have_libusb=yes @@ -43950,14 +43840,14 @@ KFI_FOUND_FREETYPE=0 - echo "$as_me:$LINENO: checking for freetype-config" >&5 -echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for freetype-config" >&5 +echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; } if test -n "$FREETYPE_CONFIG"; then kde_cv_path="$FREETYPE_CONFIG"; else kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -44000,15 +43890,15 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5 echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;} else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } FREETYPE_CONFIG=$kde_cv_path fi @@ -44044,14 +43934,14 @@ KFI_FOUND_FONTCONFIG=0 # check for fontconfig... - echo "$as_me:$LINENO: checking for fontconfig-config" >&5 -echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for fontconfig-config" >&5 +echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; } if test -n "$FONTCONFIG_CONFIG"; then kde_cv_path="$FONTCONFIG_CONFIG"; else kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -44094,18 +43984,18 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } - echo "$as_me:$LINENO: checking for pkg-config" >&5 -echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pkg-config" >&5 +echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; } if test -n "$PKGCONFIG"; then kde_cv_path="$PKGCONFIG"; else kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -44148,23 +44038,23 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5 echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;} else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } PKGCONFIG=$kde_cv_path fi else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } FONTCONFIG_CONFIG=$kde_cv_path fi @@ -44212,8 +44102,8 @@ # Check OS... - echo "$as_me:$LINENO: checking OS" >&5 -echo $ECHO_N "checking OS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking OS" >&5 +echo $ECHO_N "checking OS... $ECHO_C" >&6; } case "$host" in *-*-linux*) UNAME='Linux' ;; *-*-freebsd*) UNAME='FreeBSD' ;; @@ -44226,8 +44116,8 @@ *-*-darwin*) UNAME='Darwin' ;; *) UNAME='Unknown' ;; esac - echo "$as_me:$LINENO: result: $UNAME" >&5 -echo "${ECHO_T}$UNAME" >&6 + { echo "$as_me:$LINENO: result: $UNAME" >&5 +echo "${ECHO_T}$UNAME" >&6; } # Check for fontenc... @@ -44236,8 +44126,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -44247,17 +44136,17 @@ if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5 -echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5 +echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/fonts/fontenc.h usability" >&5 -echo $ECHO_N "checking X11/fonts/fontenc.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/fonts/fontenc.h usability" >&5 +echo $ECHO_N "checking X11/fonts/fontenc.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44268,41 +44157,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/fonts/fontenc.h presence" >&5 -echo $ECHO_N "checking X11/fonts/fontenc.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/fonts/fontenc.h presence" >&5 +echo $ECHO_N "checking X11/fonts/fontenc.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44311,24 +44196,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -44336,9 +44219,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -44362,25 +44246,18 @@ echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5 -echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5 +echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_fonts_fontenc_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6; } fi if test $ac_cv_header_X11_fonts_fontenc_h = yes; then @@ -44403,16 +44280,15 @@ ac_LDFLAGS_save="$LDFLAGS" ld_shared_flag= -echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5 -echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5 +echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; } kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -44439,34 +44315,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -44479,13 +44353,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : ld_shared_flag="-shared" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -44500,8 +44374,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5 -echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5 +echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6; } if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -44514,56 +44388,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char FontEncDirectory (); int main () { -FontEncDirectory (); +return FontEncDirectory (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_fontenc_FontEncDirectory=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_fontenc_FontEncDirectory=no + ac_cv_lib_fontenc_FontEncDirectory=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_FontEncDirectory" >&5 -echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_FontEncDirectory" >&5 +echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6; } if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then ac_font_enc_lib=1 else @@ -44596,17 +44467,17 @@ CPPFLAGS="$CXXFLAGS" if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 -echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 +echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44617,41 +44488,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 +echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44660,24 +44527,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -44685,9 +44550,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -44711,25 +44577,18 @@ echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 -echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 +echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } fi if test $ac_cv_header_X11_Xft_Xft_h = yes; then @@ -44791,9 +44650,9 @@ for ac_func in getifaddrs getnameinfo do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -44819,68 +44678,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -44889,8 +44740,8 @@ fi done -echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5 -echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5 +echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; } if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -44915,33 +44766,28 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_sockaddr_sa_len=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -44962,40 +44808,37 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_sockaddr_sa_len=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_sockaddr_sa_len=no + ac_cv_member_struct_sockaddr_sa_len=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5 -echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; } if test $ac_cv_member_struct_sockaddr_sa_len = yes; then cat >>confdefs.h <<_ACEOF @@ -45011,10 +44854,9 @@ - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -45027,9 +44869,9 @@ for ac_header in X11/extensions/Xrandr.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -45043,38 +44885,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -45104,8 +44943,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 -echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 +echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6; } if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -45118,56 +44957,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XRRSetScreenConfigAndRate (); int main () { -XRRSetScreenConfigAndRate (); +return XRRSetScreenConfigAndRate (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no + ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6; } if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then LIB_XRANDR=-lXrandr @@ -45206,28 +45042,27 @@ test -z "$GL_INCLUDE" && GL_INCLUDE= -# Check whether --with-gl or --without-gl was given. +# Check whether --with-gl was given. if test "${with_gl+set}" = set; then - withval="$with_gl" - gl_test=$withval + withval=$with_gl; gl_test=$withval else gl_test="yes" -fi; +fi + if test "x$kde_use_qt_emb" = "xyes"; then # GL and Qt Embedded is a no-go for now. ac_cv_have_gl=no elif test "x$gl_test" = xno; then ac_cv_have_gl=no else - echo "$as_me:$LINENO: checking for GL" >&5 -echo $ECHO_N "checking for GL... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GL" >&5 +echo $ECHO_N "checking for GL... $ECHO_C" >&6; } if test "${ac_cv_have_gl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -45263,35 +45098,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_have_gl="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_gl="no" + ac_cv_have_gl="no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -45306,8 +45138,8 @@ fi if test "$ac_cv_have_gl" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } GL_LDFLAGS="" GLINC="" @@ -45328,11 +45160,11 @@ else GLINC="-I$GL_INCLUDE" fi - echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5 -echo "${ECHO_T}$ac_cv_have_gl" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5 +echo "${ECHO_T}$ac_cv_have_gl" >&6; } - echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5 -echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5 +echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6; } if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -45345,56 +45177,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char glXChooseVisual (); int main () { -glXChooseVisual (); +return glXChooseVisual (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_GL_glXChooseVisual=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_GL_glXChooseVisual=no + ac_cv_lib_GL_glXChooseVisual=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6; } if test $ac_cv_lib_GL_glXChooseVisual = yes; then @@ -45417,8 +45246,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -45428,17 +45256,17 @@ if test "${ac_cv_header_kcarddb_h+set}" = set; then - echo "$as_me:$LINENO: checking for kcarddb.h" >&5 -echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kcarddb.h" >&5 +echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6; } if test "${ac_cv_header_kcarddb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5 -echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5 +echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking kcarddb.h usability" >&5 -echo $ECHO_N "checking kcarddb.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking kcarddb.h usability" >&5 +echo $ECHO_N "checking kcarddb.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -45449,41 +45277,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking kcarddb.h presence" >&5 -echo $ECHO_N "checking kcarddb.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking kcarddb.h presence" >&5 +echo $ECHO_N "checking kcarddb.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -45492,24 +45316,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -45517,9 +45339,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -45543,25 +45366,18 @@ echo "$as_me: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for kcarddb.h" >&5 -echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for kcarddb.h" >&5 +echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6; } if test "${ac_cv_header_kcarddb_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_kcarddb_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5 -echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5 +echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6; } fi if test $ac_cv_header_kcarddb_h = yes; then @@ -45608,11 +45424,11 @@ -# Check whether --with-usbids or --without-usbids was given. +# Check whether --with-usbids was given. if test "${with_usbids+set}" = set; then - withval="$with_usbids" + withval=$with_usbids; +fi -fi; if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then @@ -45635,13 +45451,13 @@ -# Check whether --with-libraw1394 or --without-libraw1394 was given. +# Check whether --with-libraw1394 was given. if test "${with_libraw1394+set}" = set; then - withval="$with_libraw1394" - + withval=$with_libraw1394; else with_libraw1394=check -fi; +fi + VIEW1394_SUBDIR= if test "x$with_libraw1394" != xno; then @@ -45649,8 +45465,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -45660,17 +45475,17 @@ if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then - echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5 -echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5 +echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6; } if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5 -echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5 +echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5 -echo $ECHO_N "checking libraw1394/raw1394.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5 +echo $ECHO_N "checking libraw1394/raw1394.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -45681,41 +45496,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking libraw1394/raw1394.h presence" >&5 -echo $ECHO_N "checking libraw1394/raw1394.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libraw1394/raw1394.h presence" >&5 +echo $ECHO_N "checking libraw1394/raw1394.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -45724,24 +45535,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -45749,9 +45558,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -45775,25 +45585,18 @@ echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5 -echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5 +echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6; } if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_libraw1394_raw1394_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5 -echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5 +echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6; } fi if test $ac_cv_header_libraw1394_raw1394_h = yes; then @@ -45834,9 +45637,9 @@ for ac_func in sigset sigaction do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -45862,68 +45665,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -45939,19 +45734,18 @@ LIB_XSS= -# Check whether --with-xscreensaver or --without-xscreensaver was given. +# Check whether --with-xscreensaver was given. if test "${with_xscreensaver+set}" = set; then - withval="$with_xscreensaver" + withval=$with_xscreensaver; +fi -fi; if test "x$with_xscreensaver" != "xno"; then kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -45960,8 +45754,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5 -echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5 +echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -45978,42 +45772,38 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_scrnsaver_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_scrnsaver_h=no + ac_cv_header_X11_extensions_scrnsaver_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6; } if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then - echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5 -echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5 +echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6; } if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -46026,56 +45816,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XScreenSaverQueryInfo (); int main () { -XScreenSaverQueryInfo (); +return XScreenSaverQueryInfo (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xext_XScreenSaverQueryInfo=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xext_XScreenSaverQueryInfo=no + ac_cv_lib_Xext_XScreenSaverQueryInfo=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; } if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then @@ -46091,16 +45878,15 @@ xss_save_cxxflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX" -echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5 -echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5 +echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; } kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -46127,37 +45913,35 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -46167,19 +45951,19 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : ld_shared_flag="-shared" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi - echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5 -echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5 +echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6; } if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -46192,56 +45976,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XScreenSaverQueryInfo (); int main () { -XScreenSaverQueryInfo (); +return XScreenSaverQueryInfo (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xss_XScreenSaverQueryInfo=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xss_XScreenSaverQueryInfo=no + ac_cv_lib_Xss_XScreenSaverQueryInfo=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5 -echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5 +echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; } if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then @@ -46283,8 +46064,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -46293,8 +46073,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/xf86misc.h" >&5 -echo $ECHO_N "checking for X11/extensions/xf86misc.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/xf86misc.h" >&5 +echo $ECHO_N "checking for X11/extensions/xf86misc.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_xf86misc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -46311,42 +46091,38 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_xf86misc_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_xf86misc_h=no + ac_cv_header_X11_extensions_xf86misc_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86misc_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86misc_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6; } if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then - echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5 -echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5 +echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6; } if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -46359,56 +46135,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XF86MiscQueryVersion (); int main () { -XF86MiscQueryVersion (); +return XF86MiscQueryVersion (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no + ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6; } if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then @@ -46435,8 +46208,8 @@ if test -n "$LIB_XF86MISC"; then - echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5 -echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5 +echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6; } if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -46449,56 +46222,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XF86MiscSetGrabKeysState (); int main () { -XF86MiscSetGrabKeysState (); +return XF86MiscSetGrabKeysState (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no + ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5 -echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6; } if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then @@ -46519,28 +46289,27 @@ test -z "$GL_INCLUDE" && GL_INCLUDE= -# Check whether --with-gl or --without-gl was given. +# Check whether --with-gl was given. if test "${with_gl+set}" = set; then - withval="$with_gl" - gl_test=$withval + withval=$with_gl; gl_test=$withval else gl_test="yes" -fi; +fi + if test "x$kde_use_qt_emb" = "xyes"; then # GL and Qt Embedded is a no-go for now. ac_cv_have_gl=no elif test "x$gl_test" = xno; then ac_cv_have_gl=no else - echo "$as_me:$LINENO: checking for GL" >&5 -echo $ECHO_N "checking for GL... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GL" >&5 +echo $ECHO_N "checking for GL... $ECHO_C" >&6; } if test "${ac_cv_have_gl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -46576,35 +46345,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_have_gl="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_gl="no" + ac_cv_have_gl="no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -46619,8 +46385,8 @@ fi if test "$ac_cv_have_gl" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } GL_LDFLAGS="" GLINC="" @@ -46641,11 +46407,11 @@ else GLINC="-I$GL_INCLUDE" fi - echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5 -echo "${ECHO_T}$ac_cv_have_gl" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5 +echo "${ECHO_T}$ac_cv_have_gl" >&6; } - echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5 -echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5 +echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6; } if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -46658,56 +46424,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char glXChooseVisual (); int main () { -glXChooseVisual (); +return glXChooseVisual (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_GL_glXChooseVisual=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_GL_glXChooseVisual=no + ac_cv_lib_GL_glXChooseVisual=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6; } if test $ac_cv_lib_GL_glXChooseVisual = yes; then @@ -46725,8 +46488,8 @@ -echo "$as_me:$LINENO: checking \"struct ucred\"" >&5 -echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking \"struct ucred\"" >&5 +echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -46748,15 +46511,15 @@ #define HAVE_STRUCT_UCRED 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking nogroup" >&5 -echo $ECHO_N "checking nogroup... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking nogroup" >&5 +echo $ECHO_N "checking nogroup... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then nogroup=65534 else @@ -46779,13 +46542,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -46818,13 +46590,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -46837,21 +46618,25 @@ ( exit $ac_status ) nogroup=65534 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $nogroup" >&5 -echo "${ECHO_T}$nogroup" >&6 + + +{ echo "$as_me:$LINENO: result: $nogroup" >&5 +echo "${ECHO_T}$nogroup" >&6; } for ac_func in getpeereid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -46877,68 +46662,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -46949,10 +46726,9 @@ -# Check whether --with-sudo-kdesu-backend or --without-sudo-kdesu-backend was given. +# Check whether --with-sudo-kdesu-backend was given. if test "${with_sudo_kdesu_backend+set}" = set; then - withval="$with_sudo_kdesu_backend" - + withval=$with_sudo_kdesu_backend; if test x$withval = xyes; then use_kdesu_backend="sudo" else @@ -46962,7 +46738,8 @@ else use_kdesu_backend="su" -fi; +fi + cat >>confdefs.h <<_ACEOF @@ -46971,14 +46748,14 @@ - echo "$as_me:$LINENO: checking for xmkmf" >&5 -echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for xmkmf" >&5 +echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6; } if test -n "$XMKMF"; then kde_cv_path="$XMKMF"; else kde_cache=`echo xmkmf | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -47021,21 +46798,21 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: xmkmf/imake not found. Please make sure it's in PATH!" >&5 echo "$as_me: error: xmkmf/imake not found. Please make sure it's in PATH!" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } XMKMF=$kde_cv_path fi -echo "$as_me:$LINENO: checking X paths" >&5 -echo $ECHO_N "checking X paths... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X paths" >&5 +echo $ECHO_N "checking X paths... $ECHO_C" >&6; } imkv=8 test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake if test "${kde_cv_defines_imake+set}" = set; then @@ -47048,15 +46825,15 @@ cat > Imakefile <<'EOF' acimake: - @echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\"" + @echo "XBINDIR=\"/usr/bin\" XLIBDIR=\"$(LIBDIR)\"" EOF - if $XMKMF >&5 2>&1 && test -f Makefile; then + if imake -I/usr/lib/X11/config -DTOPDIR=/etc/X11 -DCURDIR=. /etc/X11 >&5 2>&1 && test -f Makefile; then kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"` kde_cv_defines_imake_version=$imkv else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } { { echo "$as_me:$LINENO: error: $XMKMF (imake) failed. Make sure you have all necessary X development packages installed. On some systems a missing /lib/cpp symlink is at fault." >&5 @@ -47068,8 +46845,8 @@ cd .. rm -fr conftestdir else - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } { { echo "$as_me:$LINENO: error: cannot create temporary directory" >&5 echo "$as_me: error: cannot create temporary directory" >&2;} { (exit 1); exit 1; }; } @@ -47077,8 +46854,8 @@ fi -echo "$as_me:$LINENO: result: done" >&5 -echo "${ECHO_T}done" >&6 +{ echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6; } eval "$kde_cv_defines_imake" cat >>confdefs.h <<_ACEOF @@ -47103,9 +46880,9 @@ for ac_func in getttyent do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -47131,68 +46908,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -47205,8 +46974,8 @@ linux*) ac_cv_func_getutxent=no;; darwin*) ac_cv_func_getutxent=no;; kfreebsd*-gnu) ac_cv_func_getutxent=no;; - *) echo "$as_me:$LINENO: checking for getutxent" >&5 -echo $ECHO_N "checking for getutxent... $ECHO_C" >&6 + *) { echo "$as_me:$LINENO: checking for getutxent" >&5 +echo $ECHO_N "checking for getutxent... $ECHO_C" >&6; } if test "${ac_cv_func_getutxent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -47233,68 +47002,59 @@ #undef getutxent -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getutxent (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_getutxent) || defined (__stub___getutxent) +#if defined __stub_getutxent || defined __stub___getutxent choke me -#else -char (*f) () = getutxent; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != getutxent; +return getutxent (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_getutxent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_getutxent=no + ac_cv_func_getutxent=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getutxent" >&5 -echo "${ECHO_T}$ac_cv_func_getutxent" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getutxent" >&5 +echo "${ECHO_T}$ac_cv_func_getutxent" >&6; } ;; esac if test $ac_cv_func_getutxent = yes; then @@ -47304,8 +47064,8 @@ _ACEOF else - echo "$as_me:$LINENO: checking for getutent" >&5 -echo $ECHO_N "checking for getutent... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for getutent" >&5 +echo $ECHO_N "checking for getutent... $ECHO_C" >&6; } if test "${ac_cv_func_getutent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -47332,68 +47092,59 @@ #undef getutent -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getutent (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_getutent) || defined (__stub___getutent) +#if defined __stub_getutent || defined __stub___getutent choke me -#else -char (*f) () = getutent; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != getutent; +return getutent (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_getutent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_getutent=no + ac_cv_func_getutent=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getutent" >&5 -echo "${ECHO_T}$ac_cv_func_getutent" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getutent" >&5 +echo "${ECHO_T}$ac_cv_func_getutent" >&6; } if test $ac_cv_func_getutent = yes; then : else @@ -47406,8 +47157,8 @@ fi -echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5 -echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5 +echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6; } if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -47430,33 +47181,28 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_utmp_ut_user=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -47475,40 +47221,37 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_utmp_ut_user=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_utmp_ut_user=no + ac_cv_member_struct_utmp_ut_user=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5 -echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5 +echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6; } if test $ac_cv_member_struct_utmp_ut_user = yes; then cat >>confdefs.h <<_ACEOF @@ -47518,8 +47261,8 @@ fi -echo "$as_me:$LINENO: checking for struct passwd.pw_expire" >&5 -echo $ECHO_N "checking for struct passwd.pw_expire... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct passwd.pw_expire" >&5 +echo $ECHO_N "checking for struct passwd.pw_expire... $ECHO_C" >&6; } if test "${ac_cv_member_struct_passwd_pw_expire+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -47542,33 +47285,28 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_passwd_pw_expire=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -47587,40 +47325,37 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_passwd_pw_expire=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_passwd_pw_expire=no + ac_cv_member_struct_passwd_pw_expire=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_expire" >&5 -echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_expire" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_expire" >&5 +echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_expire" >&6; } if test $ac_cv_member_struct_passwd_pw_expire = yes; then cat >>confdefs.h <<_ACEOF @@ -47630,8 +47365,8 @@ fi -echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5 -echo $ECHO_N "checking for struct sockaddr_in.sin_len... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5 +echo $ECHO_N "checking for struct sockaddr_in.sin_len... $ECHO_C" >&6; } if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -47657,33 +47392,28 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_sockaddr_in_sin_len=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -47705,40 +47435,37 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_sockaddr_in_sin_len=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_sockaddr_in_sin_len=no + ac_cv_member_struct_sockaddr_in_sin_len=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5 -echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in_sin_len" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in_sin_len" >&6; } if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then cat >>confdefs.h <<_ACEOF @@ -47759,9 +47486,9 @@ for ac_func in setlogin setusercontext getusershell login_getclass auth_timeok do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -47787,68 +47514,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -47867,9 +47586,9 @@ for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -47895,68 +47614,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -47970,9 +47681,9 @@ for ac_func in arc4random do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -47998,68 +47709,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -48082,8 +47785,8 @@ done -echo "$as_me:$LINENO: checking for vsyslog" >&5 -echo $ECHO_N "checking for vsyslog... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for vsyslog" >&5 +echo $ECHO_N "checking for vsyslog... $ECHO_C" >&6; } if test "${ac_cv_func_vsyslog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48110,68 +47813,59 @@ #undef vsyslog -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char vsyslog (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_vsyslog) || defined (__stub___vsyslog) +#if defined __stub_vsyslog || defined __stub___vsyslog choke me -#else -char (*f) () = vsyslog; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != vsyslog; +return vsyslog (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_vsyslog=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_vsyslog=no + ac_cv_func_vsyslog=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_vsyslog" >&5 -echo "${ECHO_T}$ac_cv_func_vsyslog" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_vsyslog" >&5 +echo "${ECHO_T}$ac_cv_func_vsyslog" >&6; } if test $ac_cv_func_vsyslog = yes; then @@ -48185,8 +47879,8 @@ kdm_no_Xau=false kdm_no_Xdmcp=false -echo "$as_me:$LINENO: checking for main in -lXau" >&5 -echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -lXau" >&5 +echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6; } if test "${ac_cv_lib_Xau_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48203,46 +47897,43 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xau_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xau_main=no + ac_cv_lib_Xau_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_main" >&5 -echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_main" >&5 +echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6; } if test $ac_cv_lib_Xau_main = yes; then : else @@ -48254,16 +47945,16 @@ -# Check whether --with-xdmcp or --without-xdmcp was given. +# Check whether --with-xdmcp was given. if test "${with_xdmcp+set}" = set; then - withval="$with_xdmcp" - + withval=$with_xdmcp; else with_xdmcp=yes -fi; +fi + if test "x$with_xdmcp" = xyes; then - echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5 -echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5 +echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6; } if test "${ac_cv_lib_Xdmcp_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48280,46 +47971,43 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xdmcp_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xdmcp_main=no + ac_cv_lib_Xdmcp_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_main" >&5 -echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_main" >&5 +echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6; } if test $ac_cv_lib_Xdmcp_main = yes; then LIBXDMCP="-lXdmcp" fi @@ -48327,8 +48015,8 @@ if test -n "$LIBXDMCP"; then cppflags_safe=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_INCLUDES" - echo "$as_me:$LINENO: checking for X11/Xdmcp.h" >&5 -echo $ECHO_N "checking for X11/Xdmcp.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/Xdmcp.h" >&5 +echo $ECHO_N "checking for X11/Xdmcp.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48343,38 +48031,34 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_Xdmcp_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_Xdmcp_h=no + ac_cv_header_X11_Xdmcp_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xdmcp_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xdmcp_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xdmcp_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xdmcp_h" >&6; } if test $ac_cv_header_X11_Xdmcp_h = yes; then HAVE_X11_XDMCP_H=1 fi @@ -48393,8 +48077,8 @@ ac_save_libs=$LIBS LIBS="$LIBS $LIBXDMCP" - echo "$as_me:$LINENO: checking for XdmcpWrap" >&5 -echo $ECHO_N "checking for XdmcpWrap... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XdmcpWrap" >&5 +echo $ECHO_N "checking for XdmcpWrap... $ECHO_C" >&6; } if test "${ac_cv_func_XdmcpWrap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48421,68 +48105,59 @@ #undef XdmcpWrap -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XdmcpWrap (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_XdmcpWrap) || defined (__stub___XdmcpWrap) +#if defined __stub_XdmcpWrap || defined __stub___XdmcpWrap choke me -#else -char (*f) () = XdmcpWrap; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != XdmcpWrap; +return XdmcpWrap (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_XdmcpWrap=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_XdmcpWrap=no + ac_cv_func_XdmcpWrap=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_XdmcpWrap" >&5 -echo "${ECHO_T}$ac_cv_func_XdmcpWrap" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_XdmcpWrap" >&5 +echo "${ECHO_T}$ac_cv_func_XdmcpWrap" >&6; } if test $ac_cv_func_XdmcpWrap = yes; then @@ -48501,25 +48176,25 @@ KRB4_LIBS= KRB4_RPATH= -echo "$as_me:$LINENO: checking whether to use Kerberos v4" >&5 -echo $ECHO_N "checking whether to use Kerberos v4... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to use Kerberos v4" >&5 +echo $ECHO_N "checking whether to use Kerberos v4... $ECHO_C" >&6; } -# Check whether --with-krb4 or --without-krb4 was given. +# Check whether --with-krb4 was given. if test "${with_krb4+set}" = set; then - withval="$with_krb4" - test "x$with_krb4" = xyes && with_krb4=/usr/kerberos + withval=$with_krb4; test "x$with_krb4" = xyes && with_krb4=/usr/kerberos else with_krb4=no -fi; +fi + case "$with_krb4" in no) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; *) - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<_ACEOF #define KRB4 1 @@ -48530,8 +48205,8 @@ if test "$USE_RPATH" = "yes" ; then KRB4_RPATH="-R $with_krb4/lib" fi - echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5 -echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5 +echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6; } if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48544,56 +48219,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dn_expand (); int main () { -dn_expand (); +return dn_expand (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_resolv_dn_expand=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_resolv_dn_expand=no + ac_cv_lib_resolv_dn_expand=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; } if test $ac_cv_lib_resolv_dn_expand = yes; then KRB4_LIBS="$KRB4_LIBS -lresolv" fi @@ -48601,29 +48273,29 @@ ;; esac -echo "$as_me:$LINENO: checking whether to use AFS" >&5 -echo $ECHO_N "checking whether to use AFS... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to use AFS" >&5 +echo $ECHO_N "checking whether to use AFS... $ECHO_C" >&6; } -# Check whether --with-afs or --without-afs was given. +# Check whether --with-afs was given. if test "${with_afs+set}" = set; then - withval="$with_afs" - + withval=$with_afs; else with_afs=no -fi; +fi + if test "$with_afs" = no; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else if test "$with_krb4" = no; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { echo "$as_me:$LINENO: WARNING: \"AFS requires Kerberos v4 support.\"" >&5 echo "$as_me: WARNING: \"AFS requires Kerberos v4 support.\"" >&2;} with_afs=no else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<_ACEOF #define AFS 1 @@ -48640,8 +48312,8 @@ -echo "$as_me:$LINENO: checking for main in -ls" >&5 -echo $ECHO_N "checking for main in -ls... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -ls" >&5 +echo $ECHO_N "checking for main in -ls... $ECHO_C" >&6; } if test "${ac_cv_lib_s_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48658,53 +48330,50 @@ int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_s_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_s_main=no + ac_cv_lib_s_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_s_main" >&5 -echo "${ECHO_T}$ac_cv_lib_s_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_s_main" >&5 +echo "${ECHO_T}$ac_cv_lib_s_main" >&6; } if test $ac_cv_lib_s_main = yes; then LIB_LIBS="-ls" fi -echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5 -echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5 +echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6; } if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -48717,56 +48386,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sched_yield (); int main () { -sched_yield (); +return sched_yield (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_posix4_sched_yield=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix4_sched_yield=no + ac_cv_lib_posix4_sched_yield=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5 -echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5 +echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6; } if test $ac_cv_lib_posix4_sched_yield = yes; then LIBPOSIX4=-lposix4 fi @@ -48777,22 +48443,22 @@ KRB5_LIBS= KRB5_RPATH= -echo "$as_me:$LINENO: checking whether to use Kerberos5 for Xauth cookies in kdm" >&5 -echo $ECHO_N "checking whether to use Kerberos5 for Xauth cookies in kdm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to use Kerberos5 for Xauth cookies in kdm" >&5 +echo $ECHO_N "checking whether to use Kerberos5 for Xauth cookies in kdm... $ECHO_C" >&6; } -# Check whether --with-krb5auth or --without-krb5auth was given. +# Check whether --with-krb5auth was given. if test "${with_krb5auth+set}" = set; then - withval="$with_krb5auth" - + withval=$with_krb5auth; else with_krb5auth=no -fi; +fi + if test "x$with_krb5auth" = xno; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } if test "x$with_krb5auth" != xyes; then KRB5_INCS="-I$with_krb5auth/include" KRB5_LIBS="-L$with_krb5auth/lib" @@ -48803,17 +48469,17 @@ KRB5_LIBS="$KRB5_LIBS -lkrb5" keepcflags=$CFLAGS CFLAGS="$KRB5_INCS $CFLAGS" if test "${ac_cv_header_krb5_krb5_h+set}" = set; then - echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5 -echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5 +echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6; } if test "${ac_cv_header_krb5_krb5_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5 +echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking krb5/krb5.h usability" >&5 -echo $ECHO_N "checking krb5/krb5.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking krb5/krb5.h usability" >&5 +echo $ECHO_N "checking krb5/krb5.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -48824,41 +48490,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking krb5/krb5.h presence" >&5 -echo $ECHO_N "checking krb5/krb5.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking krb5/krb5.h presence" >&5 +echo $ECHO_N "checking krb5/krb5.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -48867,24 +48529,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -48892,9 +48552,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -48918,25 +48579,18 @@ echo "$as_me: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5 -echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5 +echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6; } if test "${ac_cv_header_krb5_krb5_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_krb5_krb5_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5 +echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6; } fi if test $ac_cv_header_krb5_krb5_h = yes; then @@ -48963,34 +48617,34 @@ -echo "$as_me:$LINENO: checking whether to use Sun's secure RPC for Xauth cookies in kdm" >&5 -echo $ECHO_N "checking whether to use Sun's secure RPC for Xauth cookies in kdm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to use Sun's secure RPC for Xauth cookies in kdm" >&5 +echo $ECHO_N "checking whether to use Sun's secure RPC for Xauth cookies in kdm... $ECHO_C" >&6; } -# Check whether --with-rpcauth or --without-rpcauth was given. +# Check whether --with-rpcauth was given. if test "${with_rpcauth+set}" = set; then - withval="$with_rpcauth" - + withval=$with_rpcauth; else with_rpcauth=no -fi; +fi + if test "x$with_rpcauth" = xno; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } if test "${ac_cv_header_rpc_rpc_h+set}" = set; then - echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5 -echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5 +echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6; } if test "${ac_cv_header_rpc_rpc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5 -echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5 +echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking rpc/rpc.h usability" >&5 -echo $ECHO_N "checking rpc/rpc.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking rpc/rpc.h usability" >&5 +echo $ECHO_N "checking rpc/rpc.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -49001,41 +48655,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking rpc/rpc.h presence" >&5 -echo $ECHO_N "checking rpc/rpc.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking rpc/rpc.h presence" >&5 +echo $ECHO_N "checking rpc/rpc.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -49044,24 +48694,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -49069,9 +48717,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -49095,25 +48744,18 @@ echo "$as_me: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5 -echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5 +echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6; } if test "${ac_cv_header_rpc_rpc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_rpc_rpc_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5 -echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5 +echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6; } fi if test $ac_cv_header_rpc_rpc_h = yes; then @@ -49160,13 +48802,13 @@ fi -# Check whether --with-kdm-xconsole or --without-kdm-xconsole was given. +# Check whether --with-kdm-xconsole was given. if test "${with_kdm_xconsole+set}" = set; then - withval="$with_kdm_xconsole" - + withval=$with_kdm_xconsole; else with_kdm_xconsole=no -fi; +fi + if test "x$with_kdm_xconsole" = xyes; then cat >>confdefs.h <<\_ACEOF @@ -49178,16 +48820,15 @@ -echo "$as_me:$LINENO: checking if covariant return works" >&5 -echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if covariant return works" >&5 +echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6; } if test "${kde_cv_covariant_return+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else kde_cv_covariant_return=no - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -49228,13 +48869,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -49245,8 +48895,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -49258,16 +48910,16 @@ if test "$kde_cv_covariant_return" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } cat >>confdefs.h <<\_ACEOF #define COVARIANT_RETURN_BROKEN 1 _ACEOF else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi @@ -49276,8 +48928,8 @@ artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -49292,29 +48944,30 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no" ;; esac fi ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG - if test -n "$ARTSCCONFIG"; then - echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5 -echo "${ECHO_T}$ARTSCCONFIG" >&6 + { echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5 +echo "${ECHO_T}$ARTSCCONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix` @@ -49345,18 +48998,19 @@ for ac_header in sys/loadavg.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -49367,41 +49021,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -49410,24 +49060,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -49435,9 +49083,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -49461,25 +49110,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -49497,8 +49140,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -49507,8 +49149,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/Xcomposite.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xcomposite.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/Xcomposite.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xcomposite.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xcomposite_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -49523,38 +49165,34 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_Xcomposite_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xcomposite_h=no + ac_cv_header_X11_extensions_Xcomposite_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xcomposite_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xcomposite_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xcomposite_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xcomposite_h" >&6; } if test $ac_cv_header_X11_extensions_Xcomposite_h = yes; then xcomposite_h=yes else @@ -49580,8 +49218,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5 -echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5 +echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; } if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -49594,56 +49232,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XCompositeQueryExtension (); int main () { -XCompositeQueryExtension (); +return XCompositeQueryExtension (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xcomposite_XCompositeQueryExtension=no + ac_cv_lib_Xcomposite_XCompositeQueryExtension=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; } if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then LIB_XCOMPOSITE=-lXcomposite @@ -49667,8 +49302,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -49677,8 +49311,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -49693,38 +49327,34 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_Xfixes_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xfixes_h=no + ac_cv_header_X11_extensions_Xfixes_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6; } if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then xfixes_h=yes else @@ -49750,8 +49380,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5 -echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5 +echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6; } if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -49764,56 +49394,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XFixesQueryExtension (); int main () { -XFixesQueryExtension (); +return XFixesQueryExtension (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xfixes_XFixesQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xfixes_XFixesQueryExtension=no + ac_cv_lib_Xfixes_XFixesQueryExtension=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6; } if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then LIB_XFIXES=-lXfixes @@ -49840,26 +49467,26 @@ ssl_libraries="" ssl_includes="" -# Check whether --with-ssl-dir or --without-ssl-dir was given. +# Check whether --with-ssl-dir was given. if test "${with_ssl_dir+set}" = set; then - withval="$with_ssl_dir" - ac_ssl_includes="$withval"/include + withval=$with_ssl_dir; ac_ssl_includes="$withval"/include ac_ssl_libraries="$withval"/lib$kdelibsuff -fi; +fi + want_ssl=yes -# Check whether --with-ssl or --without-ssl was given. +# Check whether --with-ssl was given. if test "${with_ssl+set}" = set; then - withval="$with_ssl" - want_ssl=$withval -fi; + withval=$with_ssl; want_ssl=$withval +fi + if test $want_ssl = yes; then -echo "$as_me:$LINENO: checking for OpenSSL" >&5 -echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for OpenSSL" >&5 +echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; } if test "${ac_cv_have_ssl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -49874,7 +49501,7 @@ do for j in openssl/ssl.h; do - echo "configure: 49877: $i/$j" >&5 + echo "configure: 49504: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ssl_incdir=$i @@ -49921,37 +49548,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_ssl_rsaref="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_ssl_rsaref="no" + ac_ssl_rsaref="no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$ac_ldflags_safe" @@ -49969,26 +49593,26 @@ eval "$ac_cv_have_ssl" - echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5 -echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6 + { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5 +echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; } - echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5 -echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5 -echo "${ECHO_T}$ac_ssl_rsaref" >&6 - - echo "$as_me:$LINENO: checking for easter eggs" >&5 -echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: none found" >&5 -echo "${ECHO_T}none found" >&6 + { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5 +echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5 +echo "${ECHO_T}$ac_ssl_rsaref" >&6; } + + { echo "$as_me:$LINENO: checking for easter eggs" >&5 +echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: none found" >&5 +echo "${ECHO_T}none found" >&6; } else have_ssl=no fi if test "$have_ssl" = yes; then - echo "$as_me:$LINENO: checking for OpenSSL version" >&5 -echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for OpenSSL version" >&5 +echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; } if test "${ac_cv_ssl_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -50061,8 +49685,8 @@ eval "$ac_cv_ssl_version" - echo "$as_me:$LINENO: result: $ssl_version" >&5 -echo "${ECHO_T}$ssl_version" >&6 + { echo "$as_me:$LINENO: result: $ssl_version" >&5 +echo "${ECHO_T}$ssl_version" >&6; } fi if test "$have_ssl" != yes; then @@ -50121,10 +49745,9 @@ - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -50137,18 +49760,19 @@ for ac_header in sasl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -50159,41 +49783,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -50202,24 +49822,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -50227,9 +49845,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -50253,25 +49872,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -50294,10 +49907,9 @@ - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -50310,18 +49922,19 @@ for ac_header in sasl/sasl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -50332,41 +49945,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -50375,24 +49984,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -50400,9 +50007,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -50426,25 +50034,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -50474,8 +50076,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5 -echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5 +echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6; } if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -50488,56 +50090,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sasl_client_init (); int main () { -sasl_client_init (); +return sasl_client_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_sasl2_sasl_client_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_sasl2_sasl_client_init=no + ac_cv_lib_sasl2_sasl_client_init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_init" >&5 -echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_init" >&5 +echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6; } if test $ac_cv_lib_sasl2_sasl_client_init = yes; then SASL2_LIBS="-lsasl2" fi @@ -50557,15 +50156,14 @@ -echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5 -echo $ECHO_N "checking for bzDecompress in libbz2... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5 +echo $ECHO_N "checking for bzDecompress in libbz2... $ECHO_C" >&6; } if test "${ac_cv_lib_bzip2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -50597,35 +50195,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_bzip2='-lbz2'" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_bzip2=no" + eval "ac_cv_lib_bzip2=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CXXFLAGS="$kde_save_CXXFLAGS" @@ -50637,8 +50232,8 @@ fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5 -echo "${ECHO_T}$ac_cv_lib_bzip2" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5 +echo "${ECHO_T}$ac_cv_lib_bzip2" >&6; } if test ! "$ac_cv_lib_bzip2" = no; then BZIP2DIR=bzip2 @@ -50651,16 +50246,15 @@ cxx_shared_flag= ld_shared_flag= -echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5 -echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5 +echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; } kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -50687,34 +50281,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -50727,30 +50319,29 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : ld_shared_flag="-shared" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -fPIC" >&5 -echo $ECHO_N "checking whether $CXX supports -fPIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fPIC" >&5 +echo $ECHO_N "checking whether $CXX supports -fPIC... $ECHO_C" >&6; } kde_cache=`echo fPIC | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -50777,34 +50368,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -50817,29 +50406,28 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : cxx_shared_flag="-fPIC" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi - echo "$as_me:$LINENO: checking for BZ2_bzDecompress in (shared) libbz2" >&5 -echo $ECHO_N "checking for BZ2_bzDecompress in (shared) libbz2... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for BZ2_bzDecompress in (shared) libbz2" >&5 +echo $ECHO_N "checking for BZ2_bzDecompress in (shared) libbz2... $ECHO_C" >&6; } if test "${ac_cv_lib_bzip2_prefix+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -50872,35 +50460,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_bzip2_prefix='-lbz2'" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_bzip2_prefix=no" + eval "ac_cv_lib_bzip2_prefix=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CXXFLAGS="$kde_save_CXXFLAGS" @@ -50913,8 +50498,8 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5 -echo "${ECHO_T}$ac_cv_lib_bzip2_prefix" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5 +echo "${ECHO_T}$ac_cv_lib_bzip2_prefix" >&6; } if test ! "$ac_cv_lib_bzip2_prefix" = no; then BZIP2DIR=bzip2 @@ -50955,18 +50540,19 @@ for ac_header in termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -50977,41 +50563,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -51020,24 +50602,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -51045,9 +50625,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -51071,25 +50652,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -51110,9 +50685,9 @@ for ac_func in getpt openpty isastream do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -51138,68 +50713,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -51210,13 +50777,12 @@ LIBS="$kde_save_LIBS" -echo "$as_me:$LINENO: checking for LDAP support" >&5 -echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for LDAP support" >&5 +echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; } -# Check whether --with-ldap or --without-ldap was given. +# Check whether --with-ldap was given. if test "${with_ldap+set}" = set; then - withval="$with_ldap" - case "$withval" in + withval=$with_ldap; case "$withval" in yes) with_ldap=CHECK ;; @@ -51224,7 +50790,8 @@ else with_ldap=CHECK -fi; +fi + if test "x$with_ldap" = "xCHECK" ; then with_ldap=NOTFOUND search_incs="$kde_includes /usr/include /usr/local/include" @@ -51234,7 +50801,7 @@ do for j in ldap.h; do - echo "configure: 51237: $i/$j" >&5 + echo "configure: 50804: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ldap_incdir=$i @@ -51256,7 +50823,7 @@ do for j in libldap.$ext; do - echo "configure: 51259: $i/$j" >&5 + echo "configure: 50826: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ldap_libdir=$i @@ -51279,8 +50846,8 @@ fi case "$with_ldap" in -no) echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 ;; +no) { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; framework) LDAP_LIBS="-Xlinker -framework -Xlinker LDAP" @@ -51289,18 +50856,18 @@ _ACEOF LDAP_SUBDIR="ldap" - echo "$as_me:$LINENO: result: Apple framework" >&5 -echo "${ECHO_T}Apple framework" >&6 + { echo "$as_me:$LINENO: result: Apple framework" >&5 +echo "${ECHO_T}Apple framework" >&6; } ;; FOUND) - echo "$as_me:$LINENO: result: incs=$ldap_incdir libs=$ldap_libdir" >&5 -echo "${ECHO_T}incs=$ldap_incdir libs=$ldap_libdir" >&6 + { echo "$as_me:$LINENO: result: incs=$ldap_incdir libs=$ldap_libdir" >&5 +echo "${ECHO_T}incs=$ldap_incdir libs=$ldap_libdir" >&6; } ;; -NOTFOUND) echo "$as_me:$LINENO: result: searched but not found" >&5 -echo "${ECHO_T}searched but not found" >&6 ;; +NOTFOUND) { echo "$as_me:$LINENO: result: searched but not found" >&5 +echo "${ECHO_T}searched but not found" >&6; } ;; *) - echo "$as_me:$LINENO: result: $with_ldap" >&5 -echo "${ECHO_T}$with_ldap" >&6 + { echo "$as_me:$LINENO: result: $with_ldap" >&5 +echo "${ECHO_T}$with_ldap" >&6; } ;; esac @@ -51314,8 +50881,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for ber_alloc in -llber" >&5 -echo $ECHO_N "checking for ber_alloc in -llber... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ber_alloc in -llber" >&5 +echo $ECHO_N "checking for ber_alloc in -llber... $ECHO_C" >&6; } if test "${ac_cv_lib_lber_ber_alloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -51328,56 +50895,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char ber_alloc (); int main () { -ber_alloc (); +return ber_alloc (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_lber_ber_alloc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_lber_ber_alloc=no + ac_cv_lib_lber_ber_alloc=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_alloc" >&5 -echo "${ECHO_T}$ac_cv_lib_lber_ber_alloc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_alloc" >&5 +echo "${ECHO_T}$ac_cv_lib_lber_ber_alloc" >&6; } if test $ac_cv_lib_lber_ber_alloc = yes; then LIB_LBER=-llber fi @@ -51387,8 +50951,8 @@ -echo "$as_me:$LINENO: checking whether LDAP support can be compiled" >&5 -echo $ECHO_N "checking whether LDAP support can be compiled... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether LDAP support can be compiled" >&5 +echo $ECHO_N "checking whether LDAP support can be compiled... $ECHO_C" >&6; } if test "x$with_ldap" != "xFOUND" ; then LDAP_ROOT="$with_ldap" @@ -51408,7 +50972,6 @@ LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS" CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS" - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -51438,36 +51001,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -with_ldap=no + with_ldap=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -51482,8 +51042,8 @@ LDAP_LIBS= LDAP_RPATH= LDAP_SUBDIR= - echo "$as_me:$LINENO: result: no (but first try gave $msg)" >&5 -echo "${ECHO_T}no (but first try gave $msg)" >&6 + { echo "$as_me:$LINENO: result: no (but first try gave $msg)" >&5 +echo "${ECHO_T}no (but first try gave $msg)" >&6; } else cat >>confdefs.h <<_ACEOF @@ -51491,8 +51051,8 @@ _ACEOF LDAP_SUBDIR="ldap" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi @@ -51513,17 +51073,17 @@ ########### Check for linux/cdrom.h if test "${ac_cv_header_linux_cdrom_h+set}" = set; then - echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5 -echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5 +echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; } if test "${ac_cv_header_linux_cdrom_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5 -echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5 +echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -51534,41 +51094,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&5 -echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&5 +echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -51577,24 +51133,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -51602,9 +51156,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -51628,25 +51183,18 @@ echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5 -echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5 +echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; } if test "${ac_cv_header_linux_cdrom_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_linux_cdrom_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; } fi if test $ac_cv_header_linux_cdrom_h = yes; then @@ -51665,19 +51213,19 @@ -# Check whether --with-hal or --without-hal was given. +# Check whether --with-hal was given. if test "${with_hal+set}" = set; then - withval="$with_hal" - hal_test="$withval" + withval=$with_hal; hal_test="$withval" else hal_test="yes" -fi; +fi + if test "x$hal_test" = "xyes" ; then ########### Check for the HAL - echo "$as_me:$LINENO: checking for the HAL" >&5 -echo $ECHO_N "checking for the HAL... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for the HAL" >&5 +echo $ECHO_N "checking for the HAL... $ECHO_C" >&6; } hal_inc=NOTFOUND hal_lib=NOTFOUND @@ -51690,7 +51238,7 @@ do for j in libhal.h libhal-storage.h; do - echo "configure: 51693: $i/$j" >&5 + echo "configure: 51241: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 hal_incdir=$i @@ -51712,7 +51260,7 @@ do for j in libhal.so libhal-storage.so; do - echo "configure: 51715: $i/$j" >&5 + echo "configure: 51263: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 hal_libdir=$i @@ -51741,8 +51289,8 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -51757,28 +51305,29 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -51789,25 +51338,25 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for hal > 0.5" >&5 -echo $ECHO_N "checking for hal > 0.5... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for hal > 0.5" >&5 +echo $ECHO_N "checking for hal > 0.5... $ECHO_C" >&6; } if $PKG_CONFIG --exists "hal > 0.5" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking HAL_CFLAGS" >&5 -echo $ECHO_N "checking HAL_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking HAL_CFLAGS" >&5 +echo $ECHO_N "checking HAL_CFLAGS... $ECHO_C" >&6; } HAL_CFLAGS=`$PKG_CONFIG --cflags "hal > 0.5"` - echo "$as_me:$LINENO: result: $HAL_CFLAGS" >&5 -echo "${ECHO_T}$HAL_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $HAL_CFLAGS" >&5 +echo "${ECHO_T}$HAL_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking HAL_LIBS" >&5 -echo $ECHO_N "checking HAL_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking HAL_LIBS" >&5 +echo $ECHO_N "checking HAL_LIBS... $ECHO_C" >&6; } HAL_LIBS=`$PKG_CONFIG --libs "hal > 0.5"` - echo "$as_me:$LINENO: result: $HAL_LIBS" >&5 -echo "${ECHO_T}$HAL_LIBS" >&6 + { echo "$as_me:$LINENO: result: $HAL_LIBS" >&5 +echo "${ECHO_T}$HAL_LIBS" >&6; } else HAL_CFLAGS="" HAL_LIBS="" @@ -51828,20 +51377,20 @@ if test $succeeded = yes; then HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND; else - echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH" >&5 -echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH" >&6 + { echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH" >&5 +echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH" >&6; } fi fi if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then - echo "$as_me:$LINENO: result: headers $HAL_INCS libraries $HAL_LIBS" >&5 -echo "${ECHO_T}headers $HAL_INCS libraries $HAL_LIBS" >&6 + { echo "$as_me:$LINENO: result: headers $HAL_INCS libraries $HAL_LIBS" >&5 +echo "${ECHO_T}headers $HAL_INCS libraries $HAL_LIBS" >&6; } hal=FOUND else - echo "$as_me:$LINENO: result: searched but not found" >&5 -echo "${ECHO_T}searched but not found" >&6 + { echo "$as_me:$LINENO: result: searched but not found" >&5 +echo "${ECHO_T}searched but not found" >&6; } fi @@ -51851,8 +51400,8 @@ ########### Check for DBus - echo "$as_me:$LINENO: checking for DBus" >&5 -echo $ECHO_N "checking for DBus... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for DBus" >&5 +echo $ECHO_N "checking for DBus... $ECHO_C" >&6; } dbus_inc=NOTFOUND dbus_lib=NOTFOUND @@ -51865,7 +51414,7 @@ do for j in dbus/dbus.h; do - echo "configure: 51868: $i/$j" >&5 + echo "configure: 51417: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 dbus_incdir=$i @@ -51882,7 +51431,7 @@ do for j in dbus/dbus-arch-deps.h; do - echo "configure: 51885: $i/$j" >&5 + echo "configure: 51434: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 dbus_incdir_arch_deps=$i @@ -51904,7 +51453,7 @@ do for j in libdbus-1.so; do - echo "configure: 51907: $i/$j" >&5 + echo "configure: 51456: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 dbus_libdir=$i @@ -51933,8 +51482,8 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -51949,28 +51498,29 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -51981,25 +51531,25 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for \"dbus-1\"" >&5 -echo $ECHO_N "checking for \"dbus-1\"... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for \"dbus-1\"" >&5 +echo $ECHO_N "checking for \"dbus-1\"... $ECHO_C" >&6; } if $PKG_CONFIG --exists ""dbus-1"" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 -echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; } DBUS_CFLAGS=`$PKG_CONFIG --cflags ""dbus-1""` - echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 -echo "${ECHO_T}$DBUS_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +echo "${ECHO_T}$DBUS_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 -echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; } DBUS_LIBS=`$PKG_CONFIG --libs ""dbus-1""` - echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 -echo "${ECHO_T}$DBUS_LIBS" >&6 + { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +echo "${ECHO_T}$DBUS_LIBS" >&6; } else DBUS_CFLAGS="" DBUS_LIBS="" @@ -52020,8 +51570,8 @@ if test $succeeded = yes; then DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; else - echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH " >&5 -echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH " >&6 + { echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH " >&5 +echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH " >&6; } fi @@ -52038,12 +51588,12 @@ if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then - echo "$as_me:$LINENO: result: headers $DBUS_INCS libraries $DBUS_LIBS" >&5 -echo "${ECHO_T}headers $DBUS_INCS libraries $DBUS_LIBS" >&6 + { echo "$as_me:$LINENO: result: headers $DBUS_INCS libraries $DBUS_LIBS" >&5 +echo "${ECHO_T}headers $DBUS_INCS libraries $DBUS_LIBS" >&6; } dbus=FOUND else - echo "$as_me:$LINENO: result: searched but not found" >&5 -echo "${ECHO_T}searched but not found" >&6 + { echo "$as_me:$LINENO: result: searched but not found" >&5 +echo "${ECHO_T}searched but not found" >&6; } fi @@ -52051,8 +51601,8 @@ ########### Check for DBus-Qt3 bindings - echo "$as_me:$LINENO: checking for DBus-Qt3 bindings" >&5 -echo $ECHO_N "checking for DBus-Qt3 bindings... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for DBus-Qt3 bindings" >&5 +echo $ECHO_N "checking for DBus-Qt3 bindings... $ECHO_C" >&6; } dbusqt_inc=NOTFOUND dbusqt_lib=NOTFOUND @@ -52065,7 +51615,7 @@ do for j in dbus/connection.h; do - echo "configure: 52068: $i/$j" >&5 + echo "configure: 51618: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 dbusqt_incdir=$i @@ -52092,7 +51642,7 @@ do for j in libdbus-qt-1.so; do - echo "configure: 52095: $i/$j" >&5 + echo "configure: 51645: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 dbusqt_libdir=$i @@ -52116,7 +51666,7 @@ do for j in dbus/connection.h; do - echo "configure: 52119: $i/$j" >&5 + echo "configure: 51669: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 dbusqt_incdir=$i @@ -52142,7 +51692,7 @@ do for j in libdbus-qt-1.so; do - echo "configure: 52145: $i/$j" >&5 + echo "configure: 51695: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 dbusqt_libdir=$i @@ -52161,12 +51711,12 @@ if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then - echo "$as_me:$LINENO: result: headers $dbusqt_incdir libraries $dbusqt_libdir" >&5 -echo "${ECHO_T}headers $dbusqt_incdir libraries $dbusqt_libdir" >&6 + { echo "$as_me:$LINENO: result: headers $dbusqt_incdir libraries $dbusqt_libdir" >&5 +echo "${ECHO_T}headers $dbusqt_incdir libraries $dbusqt_libdir" >&6; } dbusqt=FOUND else - echo "$as_me:$LINENO: result: searched but not found" >&5 -echo "${ECHO_T}searched but not found" >&6 + { echo "$as_me:$LINENO: result: searched but not found" >&5 +echo "${ECHO_T}searched but not found" >&6; } fi @@ -52175,8 +51725,8 @@ ########### Check if media HAL backend sould be compiled -echo "$as_me:$LINENO: checking if the HAL backend for media:/ should be compiled" >&5 -echo $ECHO_N "checking if the HAL backend for media:/ should be compiled... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the HAL backend for media:/ should be compiled" >&5 +echo $ECHO_N "checking if the HAL backend for media:/ should be compiled... $ECHO_C" >&6; } HALBACKEND=no if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then @@ -52187,11 +51737,11 @@ HALBACKEND=yes - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -52218,15 +51768,15 @@ -# Check whether --enable-largefile or --disable-largefile was given. +# Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" + enableval=$enable_largefile; +fi -fi; if test "$enable_largefile" != no; then - echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -52234,8 +51784,8 @@ if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -52259,84 +51809,77 @@ return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_largefile_CC=' -n32'; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do - ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -52361,34 +51904,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_file_offset_bits=no; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -52414,54 +51954,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 -if test "$ac_cv_sys_file_offset_bits" != no; then - +{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits _ACEOF - -fi +;; +esac rm -f conftest* - echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test $ac_cv_sys_file_offset_bits = unknown; then + { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do - ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -52486,34 +52025,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_large_files=no; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -52539,47 +52075,47 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6 -if test "$ac_cv_sys_large_files" != no; then - +{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF #define _LARGE_FILES $ac_cv_sys_large_files _ACEOF - -fi +;; +esac rm -f conftest* + fi fi if test "$ac_cv_sys_file_offset_bits" != no; then @@ -52595,13 +52131,13 @@ -# Check whether --with-samba or --without-samba was given. +# Check whether --with-samba was given. if test "${with_samba+set}" = set; then - withval="$with_samba" - + withval=$with_samba; else with_samba=check -fi; +fi + have_libsmbclient=no if test "x$with_samba" != xno; then @@ -52610,8 +52146,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -52621,17 +52156,17 @@ if test "${ac_cv_header_libsmbclient_h+set}" = set; then - echo "$as_me:$LINENO: checking for libsmbclient.h" >&5 -echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libsmbclient.h" >&5 +echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6; } if test "${ac_cv_header_libsmbclient_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5 -echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5 +echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking libsmbclient.h usability" >&5 -echo $ECHO_N "checking libsmbclient.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libsmbclient.h usability" >&5 +echo $ECHO_N "checking libsmbclient.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -52642,41 +52177,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking libsmbclient.h presence" >&5 -echo $ECHO_N "checking libsmbclient.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libsmbclient.h presence" >&5 +echo $ECHO_N "checking libsmbclient.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -52685,24 +52216,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -52710,9 +52239,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -52736,25 +52266,18 @@ echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for libsmbclient.h" >&5 -echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libsmbclient.h" >&5 +echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6; } if test "${ac_cv_header_libsmbclient_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_libsmbclient_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5 -echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5 +echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6; } fi if test $ac_cv_header_libsmbclient_h = yes; then @@ -52782,8 +52305,8 @@ ;; esac -echo "$as_me:$LINENO: checking for smbc_new_context in -lsmbclient" >&5 -echo $ECHO_N "checking for smbc_new_context in -lsmbclient... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for smbc_new_context in -lsmbclient" >&5 +echo $ECHO_N "checking for smbc_new_context in -lsmbclient... $ECHO_C" >&6; } if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -52796,56 +52319,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char smbc_new_context (); int main () { -smbc_new_context (); +return smbc_new_context (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_smbclient_smbc_new_context=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_smbclient_smbc_new_context=no + ac_cv_lib_smbclient_smbc_new_context=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_smbclient_smbc_new_context" >&5 -echo "${ECHO_T}$ac_cv_lib_smbclient_smbc_new_context" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_smbclient_smbc_new_context" >&5 +echo "${ECHO_T}$ac_cv_lib_smbclient_smbc_new_context" >&6; } if test $ac_cv_lib_smbclient_smbc_new_context = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSMBCLIENT 1 @@ -52862,8 +52382,8 @@ SMBCLIENT_EXTRA_LIBS="" - echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5 -echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5 +echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6; } if test "${ac_cv_func_yp_get_default_domain+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -52890,68 +52410,59 @@ #undef yp_get_default_domain -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char yp_get_default_domain (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_yp_get_default_domain) || defined (__stub___yp_get_default_domain) +#if defined __stub_yp_get_default_domain || defined __stub___yp_get_default_domain choke me -#else -char (*f) () = yp_get_default_domain; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != yp_get_default_domain; +return yp_get_default_domain (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_yp_get_default_domain=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_yp_get_default_domain=no + ac_cv_func_yp_get_default_domain=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5 -echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5 +echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6; } if test $ac_cv_func_yp_get_default_domain = yes; then : else @@ -52965,8 +52476,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5 -echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5 +echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -52979,56 +52490,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char yp_get_default_domain (); int main () { -yp_get_default_domain (); +return yp_get_default_domain (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_nsl_yp_get_default_domain=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_yp_get_default_domain=no + ac_cv_lib_nsl_yp_get_default_domain=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; } if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then SMBCLIENT_EXTRA_LIBS="-lnsl" fi @@ -53063,13 +52571,13 @@ -# Check whether --with-openexr or --without-openexr was given. +# Check whether --with-openexr was given. if test "${with_openexr+set}" = set; then - withval="$with_openexr" - + withval=$with_openexr; else with_openexr=check -fi; +fi + if test "x$with_openexr" != xno; then @@ -53082,8 +52590,8 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -53098,56 +52606,56 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi - echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5 -echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5 +echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6; } if test "$PKG_CONFIG" = "no" ; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } echo "*** The pkg-config script could not be found. Make sure it is" echo "*** in your path, or set the PKG_CONFIG environment variable" echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else if !(`$PKG_CONFIG --exists OpenEXR`) ; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } EXRSTATUS=no else if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } EXRSTATUS=old else kde_save_LIBS="$LIBS" LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -53182,36 +52690,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_libexr=no" + eval "ac_cv_libexr=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CXXFLAGS="$kde_save_CXXFLAGS" @@ -53230,11 +52735,11 @@ _ACEOF LIB_EXR="$ac_cv_libexr" - echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5 -echo "${ECHO_T}$ac_cv_libexr" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5 +echo "${ECHO_T}$ac_cv_libexr" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIB_EXR="" fi fi @@ -53266,8 +52771,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -53276,8 +52780,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -53292,38 +52796,34 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_Xfixes_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xfixes_h=no + ac_cv_header_X11_extensions_Xfixes_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6; } if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then xfixes_h=yes else @@ -53349,8 +52849,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5 -echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5 +echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6; } if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -53363,56 +52863,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XFixesQueryExtension (); int main () { -XFixesQueryExtension (); +return XFixesQueryExtension (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xfixes_XFixesQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xfixes_XFixesQueryExtension=no + ac_cv_lib_Xfixes_XFixesQueryExtension=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6; } if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then LIB_XFIXES=-lXfixes @@ -53440,15 +52937,14 @@ kde_mallinfo_type= -echo "$as_me:$LINENO: checking for mallinfo() in " >&5 -echo $ECHO_N "checking for mallinfo() in ... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mallinfo() in " >&5 +echo $ECHO_N "checking for mallinfo() in ... $ECHO_C" >&6; } if test "${kde_cv_func_mallinfo_stdlib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -53481,35 +52977,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_mallinfo_stdlib=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_mallinfo_stdlib=no + kde_cv_func_mallinfo_stdlib=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -53522,20 +53014,19 @@ if test "$kde_cv_func_mallinfo_stdlib" = "yes"; then kde_mallinfo_type=stdlib fi -echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_stdlib" >&5 -echo "${ECHO_T}$kde_cv_func_mallinfo_stdlib" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_stdlib" >&5 +echo "${ECHO_T}$kde_cv_func_mallinfo_stdlib" >&6; } if test -z "$kde_mallinfo_type"; then -echo "$as_me:$LINENO: checking for mallinfo() in " >&5 -echo $ECHO_N "checking for mallinfo() in ... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mallinfo() in " >&5 +echo $ECHO_N "checking for mallinfo() in ... $ECHO_C" >&6; } if test "${kde_cv_func_mallinfo_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -53568,35 +53059,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_mallinfo_malloc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_mallinfo_malloc=no + kde_cv_func_mallinfo_malloc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -53609,8 +53096,8 @@ if test "$kde_cv_func_mallinfo_malloc" = "yes"; then kde_mallinfo_type=malloc fi -echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_malloc" >&5 -echo "${ECHO_T}$kde_cv_func_mallinfo_malloc" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_malloc" >&5 +echo "${ECHO_T}$kde_cv_func_mallinfo_malloc" >&6; } fi @@ -53621,50 +53108,46 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char mallinfo (); int main () { -mallinfo (); +return mallinfo (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: checking for mallinfo in -lmalloc" >&5 -echo $ECHO_N "checking for mallinfo in -lmalloc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for mallinfo in -lmalloc" >&5 +echo $ECHO_N "checking for mallinfo in -lmalloc... $ECHO_C" >&6; } if test "${ac_cv_lib_malloc_mallinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -53677,56 +53160,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char mallinfo (); int main () { -mallinfo (); +return mallinfo (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_malloc_mallinfo=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_malloc_mallinfo=no + ac_cv_lib_malloc_mallinfo=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_malloc_mallinfo" >&5 -echo "${ECHO_T}$ac_cv_lib_malloc_mallinfo" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_malloc_mallinfo" >&5 +echo "${ECHO_T}$ac_cv_lib_malloc_mallinfo" >&6; } if test $ac_cv_lib_malloc_mallinfo = yes; then LIBMALLOC="-lmalloc" @@ -53736,20 +53216,20 @@ fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -n "$kde_mallinfo_type"; then -echo "$as_me:$LINENO: checking whether to use mallinfo field hblkhd" >&5 -echo $ECHO_N "checking whether to use mallinfo field hblkhd... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to use mallinfo field hblkhd" >&5 +echo $ECHO_N "checking whether to use mallinfo field hblkhd... $ECHO_C" >&6; } if test "${kde_cv_func_mallinfo_field_hblkhd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -53833,13 +53313,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -53852,8 +53341,10 @@ ( exit $ac_status ) kde_cv_func_mallinfo_field_hblkhd=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -53863,8 +53354,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_hblkhd" >&5 -echo "${ECHO_T}$kde_cv_func_mallinfo_field_hblkhd" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_hblkhd" >&5 +echo "${ECHO_T}$kde_cv_func_mallinfo_field_hblkhd" >&6; } kde_mallinfo_hblkhd=$kde_cv_func_mallinfo_field_hblkhd if test "$kde_mallinfo_hblkhd" = "yes"; then @@ -53875,15 +53366,14 @@ fi -echo "$as_me:$LINENO: checking whether to use mallinfo field uordblks" >&5 -echo $ECHO_N "checking whether to use mallinfo field uordblks... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to use mallinfo field uordblks" >&5 +echo $ECHO_N "checking whether to use mallinfo field uordblks... $ECHO_C" >&6; } if test "${kde_cv_func_mallinfo_field_uordblks+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -53967,13 +53457,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -53986,8 +53485,10 @@ ( exit $ac_status ) kde_cv_func_mallinfo_field_uordblks=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -53997,8 +53498,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_uordblks" >&5 -echo "${ECHO_T}$kde_cv_func_mallinfo_field_uordblks" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_uordblks" >&5 +echo "${ECHO_T}$kde_cv_func_mallinfo_field_uordblks" >&6; } kde_mallinfo_uordblks=$kde_cv_func_mallinfo_field_uordblks if test "$kde_mallinfo_uordblks" = "yes"; then @@ -54009,15 +53510,14 @@ fi -echo "$as_me:$LINENO: checking whether to use mallinfo field usmblks" >&5 -echo $ECHO_N "checking whether to use mallinfo field usmblks... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to use mallinfo field usmblks" >&5 +echo $ECHO_N "checking whether to use mallinfo field usmblks... $ECHO_C" >&6; } if test "${kde_cv_func_mallinfo_field_usmblks+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -54101,13 +53601,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -54120,8 +53629,10 @@ ( exit $ac_status ) kde_cv_func_mallinfo_field_usmblks=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -54131,8 +53642,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_usmblks" >&5 -echo "${ECHO_T}$kde_cv_func_mallinfo_field_usmblks" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_usmblks" >&5 +echo "${ECHO_T}$kde_cv_func_mallinfo_field_usmblks" >&6; } kde_mallinfo_usmblks=$kde_cv_func_mallinfo_field_usmblks if test "$kde_mallinfo_usmblks" = "yes"; then @@ -54164,14 +53675,14 @@ fi -echo "$as_me:$LINENO: checking whether we can use openpty" >&5 -echo $ECHO_N "checking whether we can use openpty... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we can use openpty" >&5 +echo $ECHO_N "checking whether we can use openpty... $ECHO_C" >&6; } ac_use_openpty="yes" -# Check whether --enable-openpty or --disable-openpty was given. +# Check whether --enable-openpty was given. if test "${enable_openpty+set}" = set; then - enableval="$enable_openpty" - ac_use_openpty="no" -fi; + enableval=$enable_openpty; ac_use_openpty="no" +fi + if test "$ac_use_openpty" = "yes"; then kde_safe_LIBS=$LIBS LIBS="$LIBS $LIBUTIL" @@ -54202,13 +53713,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -54221,8 +53741,10 @@ ( exit $ac_status ) ac_use_openpty="no" fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + LIBS=$kde_safe_LIBS fi if test "$ac_use_openpty" = "yes"; then @@ -54231,21 +53753,21 @@ #define HAVE_OPENPTY 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking how cwd can be be found by seperate process" >&5 -echo $ECHO_N "checking how cwd can be be found by seperate process... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how cwd can be be found by seperate process" >&5 +echo $ECHO_N "checking how cwd can be be found by seperate process... $ECHO_C" >&6; } case "$host" in *-*-linux*) cwd_method='proc' ;; *) cwd_method='no' ;; esac -echo "$as_me:$LINENO: result: $cwd_method" >&5 -echo "${ECHO_T}$cwd_method" >&6 +{ echo "$as_me:$LINENO: result: $cwd_method" >&5 +echo "${ECHO_T}$cwd_method" >&6; } case "$cwd_method" in proc) @@ -54261,9 +53783,9 @@ for ac_func in _IceTransNoListen do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -54289,68 +53811,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -54364,11 +53878,11 @@ LIB_XINERAMA= -# Check whether --with-xinerama or --without-xinerama was given. +# Check whether --with-xinerama was given. if test "${with_xinerama+set}" = set; then - withval="$with_xinerama" + withval=$with_xinerama; +fi -fi; if test "x$with_xinerama" != "xno"; then xinerama_save_ldflags="$LDFLAGS" @@ -54378,8 +53892,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -54388,8 +53901,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -54406,42 +53919,38 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_Xinerama_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xinerama_h=no + ac_cv_header_X11_extensions_Xinerama_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then - echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 -echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -54454,56 +53963,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XineramaQueryExtension (); int main () { -XineramaQueryExtension (); +return XineramaQueryExtension (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xinerama_XineramaQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xinerama_XineramaQueryExtension=no + ac_cv_lib_Xinerama_XineramaQueryExtension=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then @@ -54533,8 +54039,8 @@ fi -echo "$as_me:$LINENO: checking if ksysguardd can be compiled" >&5 -echo $ECHO_N "checking if ksysguardd can be compiled... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if ksysguardd can be compiled" >&5 +echo $ECHO_N "checking if ksysguardd can be compiled... $ECHO_C" >&6; } case "$host" in *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; @@ -54546,8 +54052,8 @@ *) ksysguardd_compile=no; UNAME='' ;; esac -echo "$as_me:$LINENO: result: $ksysguardd_compile" >&5 -echo "${ECHO_T}$ksysguardd_compile" >&6 +{ echo "$as_me:$LINENO: result: $ksysguardd_compile" >&5 +echo "${ECHO_T}$ksysguardd_compile" >&6; } @@ -54632,23 +54138,22 @@ -# Check whether --with-sensors or --without-sensors was given. +# Check whether --with-sensors was given. if test "${with_sensors+set}" = set; then - withval="$with_sensors" - + withval=$with_sensors; else with_sensors=check -fi; +fi -if test "x$with_sensors" != xno; then +if test "x$with_sensors" != xno; then kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -54661,18 +54166,19 @@ for ac_header in sensors/sensors.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -54683,41 +54189,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -54726,24 +54228,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -54751,9 +54251,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -54777,25 +54278,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -54824,8 +54319,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for sensors_init in -lsensors" >&5 -echo $ECHO_N "checking for sensors_init in -lsensors... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sensors_init in -lsensors" >&5 +echo $ECHO_N "checking for sensors_init in -lsensors... $ECHO_C" >&6; } if test "${ac_cv_lib_sensors_sensors_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -54838,56 +54333,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sensors_init (); int main () { -sensors_init (); +return sensors_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_sensors_sensors_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_sensors_sensors_init=no + ac_cv_lib_sensors_sensors_init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sensors_sensors_init" >&5 -echo "${ECHO_T}$ac_cv_lib_sensors_sensors_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_sensors_sensors_init" >&5 +echo "${ECHO_T}$ac_cv_lib_sensors_sensors_init" >&6; } if test $ac_cv_lib_sensors_sensors_init = yes; then LIBSENSORS="-lsensors" fi @@ -54924,16 +54416,16 @@ #MIN_CONFIG -# Check whether --enable-dnssd or --disable-dnssd was given. +# Check whether --enable-dnssd was given. if test "${enable_dnssd+set}" = set; then - enableval="$enable_dnssd" - with_dnssd=$enableval + enableval=$enable_dnssd; with_dnssd=$enableval else with_dnssd=yes -fi; +fi + if test "$with_dnssd" = "yes"; then -echo "$as_me:$LINENO: checking for DNS-SD support" >&5 -echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for DNS-SD support" >&5 +echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6; } save_dnssdtest_LIBS="$LIBS" save_dnssdtest_LDFLAGS="$LDFLAGS" save_dnssdtest_CPPFLAGS="$CPPFLAGS" @@ -54965,27 +54457,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then cat >>confdefs.h <<\_ACEOF @@ -54997,20 +54485,21 @@ *) LIB_DNSSD="-ldns_sd" ;; esac have_libdns_sd="yes" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIB_DNSSD="" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS=$save_dnssdtest_CPPFLAGS LDFLAGS=$save_dnssdtest_LDFLAGS @@ -55033,10 +54522,9 @@ - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -55049,9 +54537,9 @@ for ac_header in X11/extensions/Xdamage.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -55065,38 +54553,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -55120,10 +54605,9 @@ - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -55136,9 +54620,9 @@ for ac_header in X11/extensions/Xcomposite.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -55152,38 +54636,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -55207,10 +54688,9 @@ - kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -55223,9 +54703,9 @@ for ac_header in X11/extensions/Xrender.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -55239,38 +54719,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -55309,8 +54786,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -55320,17 +54796,17 @@ if test "${ac_cv_header_X11_Xlib_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 +echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_Xlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5 -echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5 +echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -55341,41 +54817,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5 -echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5 +echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -55384,24 +54856,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -55409,9 +54879,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -55435,25 +54906,18 @@ echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 +echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_Xlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_Xlib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } fi @@ -55470,8 +54934,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -55480,8 +54943,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 -echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5 +echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -55498,38 +54961,34 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_XKBstr_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_XKBstr_h=no + ac_cv_header_X11_extensions_XKBstr_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; } if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then : else @@ -55549,8 +55008,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -55559,8 +55017,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - echo "$as_me:$LINENO: checking for X11/extensions/XKBrules.h" >&5 -echo $ECHO_N "checking for X11/extensions/XKBrules.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/extensions/XKBrules.h" >&5 +echo $ECHO_N "checking for X11/extensions/XKBrules.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_XKBrules_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -55579,38 +55037,34 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_X11_extensions_XKBrules_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_XKBrules_h=no + ac_cv_header_X11_extensions_XKBrules_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBrules_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBrules_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBrules_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBrules_h" >&6; } if test $ac_cv_header_X11_extensions_XKBrules_h = yes; then : else @@ -55647,8 +55101,8 @@ fi for i in $ac_topsubdirs; do - echo "$as_me:$LINENO: checking if $i should be compiled" >&5 -echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if $i should be compiled" >&5 +echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; } if test -d $srcdir/$i; then install_it="yes" for j in $DO_NOT_COMPILE; do @@ -55659,8 +55113,8 @@ else install_it="no" fi - echo "$as_me:$LINENO: result: $install_it" >&5 -echo "${ECHO_T}$install_it" >&6 + { echo "$as_me:$LINENO: result: $install_it" >&5 +echo "${ECHO_T}$install_it" >&6; } vari=`echo $i | sed -e 's,[-+.@],_,g'` if test $install_it = "yes"; then TOPSUBDIRS="$TOPSUBDIRS $i" @@ -57118,39 +56572,58 @@ # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -57159,38 +56632,31 @@ # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -57768,17 +57234,45 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -57788,8 +57282,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -57803,18 +57332,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -57822,159 +57352,120 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi +# CDPATH. +$as_unset CDPATH - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -57983,7 +57474,28 @@ as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -57992,31 +57504,14 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -58024,30 +57519,20 @@ CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -58055,7 +57540,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -58074,19 +57559,21 @@ $config_commands Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -58097,39 +57584,24 @@ do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -58139,18 +57611,24 @@ $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -58166,530 +57644,542 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "applnk/Makefile" ) CONFIG_FILES="$CONFIG_FILES applnk/Makefile" ;; - "applnk/compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES applnk/compat/Makefile" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/faq/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/faq/Makefile" ;; - "doc/glossary/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/glossary/Makefile" ;; - "doc/kappfinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kappfinder/Makefile" ;; - "doc/kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kate/Makefile" ;; - "doc/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/Makefile" ;; - "doc/kcontrol/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/arts/Makefile" ;; - "doc/kcontrol/background/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/background/Makefile" ;; - "doc/kcontrol/bell/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/bell/Makefile" ;; - "doc/kcontrol/cache/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cache/Makefile" ;; - "doc/kcontrol/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/clock/Makefile" ;; - "doc/kcontrol/colors/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/colors/Makefile" ;; - "doc/kcontrol/cookies/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cookies/Makefile" ;; - "doc/kcontrol/crypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/crypto/Makefile" ;; - "doc/kcontrol/desktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktop/Makefile" ;; - "doc/kcontrol/desktopbehavior/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktopbehavior/Makefile" ;; - "doc/kcontrol/ebrowsing/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/ebrowsing/Makefile" ;; - "doc/kcontrol/email/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/email/Makefile" ;; - "doc/kcontrol/energy/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/energy/Makefile" ;; - "doc/kcontrol/filemanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filemanager/Makefile" ;; - "doc/kcontrol/filetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filetypes/Makefile" ;; - "doc/kcontrol/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/fonts/Makefile" ;; - "doc/kcontrol/helpindex/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/helpindex/Makefile" ;; - "doc/kcontrol/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/icons/Makefile" ;; - "doc/kcontrol/kcmaccess/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmaccess/Makefile" ;; - "doc/kcontrol/kcmcss/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmcss/Makefile" ;; - "doc/kcontrol/kcmfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmfontinst/Makefile" ;; - "doc/kcontrol/kcmkonsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmkonsole/Makefile" ;; - "doc/kcontrol/kcmlaunch/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmlaunch/Makefile" ;; - "doc/kcontrol/kcmnotify/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmnotify/Makefile" ;; - "doc/kcontrol/kcmsmserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmsmserver/Makefile" ;; - "doc/kcontrol/kcmstyle/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmstyle/Makefile" ;; - "doc/kcontrol/kcmtaskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmtaskbar/Makefile" ;; - "doc/kcontrol/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kdm/Makefile" ;; - "doc/kcontrol/keyboard/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keyboard/Makefile" ;; - "doc/kcontrol/keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keys/Makefile" ;; - "doc/kcontrol/khtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/khtml/Makefile" ;; - "doc/kcontrol/kwindecoration/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kwindecoration/Makefile" ;; - "doc/kcontrol/language/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/language/Makefile" ;; - "doc/kcontrol/mouse/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/mouse/Makefile" ;; - "doc/kcontrol/netpref/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/netpref/Makefile" ;; - "doc/kcontrol/panel/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panel/Makefile" ;; - "doc/kcontrol/panelappearance/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panelappearance/Makefile" ;; - "doc/kcontrol/passwords/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/passwords/Makefile" ;; - "doc/kcontrol/performance/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/performance/Makefile" ;; - "doc/kcontrol/proxy/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/proxy/Makefile" ;; - "doc/kcontrol/screensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/screensaver/Makefile" ;; - "doc/kcontrol/smb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/smb/Makefile" ;; - "doc/kcontrol/spellchecking/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/spellchecking/Makefile" ;; - "doc/kcontrol/useragent/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/useragent/Makefile" ;; - "doc/kcontrol/windowmanagement/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/windowmanagement/Makefile" ;; - "doc/kdcop/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdcop/Makefile" ;; - "doc/kdebugdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdebugdialog/Makefile" ;; - "doc/kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdeprint/Makefile" ;; - "doc/kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdesu/Makefile" ;; - "doc/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdm/Makefile" ;; - "doc/kfind/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kfind/Makefile" ;; - "doc/khelpcenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/khelpcenter/Makefile" ;; - "doc/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kicker/Makefile" ;; - "doc/kinfocenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/Makefile" ;; - "doc/kinfocenter/cdinfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/cdinfo/Makefile" ;; - "doc/kinfocenter/devices/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/devices/Makefile" ;; - "doc/kinfocenter/dma/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/dma/Makefile" ;; - "doc/kinfocenter/interrupts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/interrupts/Makefile" ;; - "doc/kinfocenter/ioports/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/ioports/Makefile" ;; - "doc/kinfocenter/memory/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/memory/Makefile" ;; - "doc/kinfocenter/nics/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/nics/Makefile" ;; - "doc/kinfocenter/opengl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/opengl/Makefile" ;; - "doc/kinfocenter/partitions/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/partitions/Makefile" ;; - "doc/kinfocenter/pci/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pci/Makefile" ;; - "doc/kinfocenter/pcmcia/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pcmcia/Makefile" ;; - "doc/kinfocenter/processor/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/processor/Makefile" ;; - "doc/kinfocenter/protocols/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/protocols/Makefile" ;; - "doc/kinfocenter/samba/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/samba/Makefile" ;; - "doc/kinfocenter/scsi/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/scsi/Makefile" ;; - "doc/kinfocenter/sound/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/sound/Makefile" ;; - "doc/kinfocenter/usb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/usb/Makefile" ;; - "doc/kinfocenter/xserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/xserver/Makefile" ;; - "doc/kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kioslave/Makefile" ;; - "doc/klipper/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/klipper/Makefile" ;; - "doc/kmenuedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kmenuedit/Makefile" ;; - "doc/knetattach/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/knetattach/Makefile" ;; - "doc/kompmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kompmgr/Makefile" ;; - "doc/konqueror/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konqueror/Makefile" ;; - "doc/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konsole/Makefile" ;; - "doc/kpager/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpager/Makefile" ;; - "doc/ksplashml/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksplashml/Makefile" ;; - "doc/ksysguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksysguard/Makefile" ;; - "doc/kwrite/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kwrite/Makefile" ;; - "doc/kxkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kxkb/Makefile" ;; - "doc/quickstart/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/quickstart/Makefile" ;; - "doc/userguide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/userguide/Makefile" ;; - "doc/visualdict/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/visualdict/Makefile" ;; - "drkonqi/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/Makefile" ;; - "drkonqi/debuggers/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/debuggers/Makefile" ;; - "drkonqi/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/pics/Makefile" ;; - "drkonqi/presets/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/presets/Makefile" ;; - "kappfinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/Makefile" ;; - "kappfinder/apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Makefile" ;; - "kappfinder/apps/Development/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Development/Makefile" ;; - "kappfinder/apps/Games/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Makefile" ;; - "kappfinder/apps/Games/Arcade/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Arcade/Makefile" ;; - "kappfinder/apps/Games/Board/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Board/Makefile" ;; - "kappfinder/apps/Games/Card/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Card/Makefile" ;; - "kappfinder/apps/Games/Emulators/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Emulators/Makefile" ;; - "kappfinder/apps/Games/Roguelikes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Roguelikes/Makefile" ;; - "kappfinder/apps/Games/TacticStrategy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/TacticStrategy/Makefile" ;; - "kappfinder/apps/Games/Toys/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Toys/Makefile" ;; - "kappfinder/apps/Graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Graphics/Makefile" ;; - "kappfinder/apps/Internet/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Makefile" ;; - "kappfinder/apps/Internet/Terminal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Terminal/Makefile" ;; - "kappfinder/apps/Multimedia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Multimedia/Makefile" ;; - "kappfinder/apps/Office/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Office/Makefile" ;; - "kappfinder/apps/System/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Makefile" ;; - "kappfinder/apps/System/Terminal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Terminal/Makefile" ;; - "kappfinder/apps/Utilities/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Makefile" ;; - "kappfinder/apps/Utilities/Editors/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Editors/Makefile" ;; - "kappfinder/apps/Utilities/xutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/xutils/Makefile" ;; - "kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/Makefile" ;; - "kate/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/app/Makefile" ;; - "kate/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/data/Makefile" ;; - "kate/interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/interfaces/Makefile" ;; - "kate/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/pics/Makefile" ;; - "kate/pics/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/pics/actions/Makefile" ;; - "kate/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/utils/Makefile" ;; - "kcheckpass/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcheckpass/Makefile" ;; - "kcminit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcminit/Makefile" ;; - "kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/Makefile" ;; - "kcontrol/access/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/access/Makefile" ;; - "kcontrol/accessibility/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/accessibility/Makefile" ;; - "kcontrol/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/arts/Makefile" ;; - "kcontrol/background/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/background/Makefile" ;; - "kcontrol/background/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/background/pics/Makefile" ;; - "kcontrol/bell/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/bell/Makefile" ;; - "kcontrol/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/clock/Makefile" ;; - "kcontrol/colors/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/colors/Makefile" ;; - "kcontrol/componentchooser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/Makefile" ;; - "kcontrol/componentchooser/componentservices/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/componentservices/Makefile" ;; - "kcontrol/crypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/crypto/Makefile" ;; - "kcontrol/css/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/css/Makefile" ;; - "kcontrol/display/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/display/Makefile" ;; - "kcontrol/dnssd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/dnssd/Makefile" ;; - "kcontrol/ebrowsing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/Makefile" ;; - "kcontrol/ebrowsing/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/Makefile" ;; - "kcontrol/ebrowsing/plugins/ikws/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/Makefile" ;; - "kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ;; - "kcontrol/ebrowsing/plugins/localdomain/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/localdomain/Makefile" ;; - "kcontrol/ebrowsing/plugins/shorturi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/shorturi/Makefile" ;; - "kcontrol/energy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/energy/Makefile" ;; - "kcontrol/energy/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/energy/pics/Makefile" ;; - "kcontrol/filetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/filetypes/Makefile" ;; - "kcontrol/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/fonts/Makefile" ;; - "kcontrol/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/icons/Makefile" ;; - "kcontrol/info/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/info/Makefile" ;; - "kcontrol/input/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/Makefile" ;; - "kcontrol/input/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/core/Makefile" ;; - "kcontrol/input/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/pics/Makefile" ;; - "kcontrol/input/xcursor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/xcursor/Makefile" ;; - "kcontrol/ioslaveinfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ioslaveinfo/Makefile" ;; - "kcontrol/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/joystick/Makefile" ;; - "kcontrol/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/Makefile" ;; - "kcontrol/kcontrol/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/about/Makefile" ;; - "kcontrol/kded/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kded/Makefile" ;; - "kcontrol/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kdm/Makefile" ;; - "kcontrol/keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/keys/Makefile" ;; - "kcontrol/kfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/Makefile" ;; - "kcontrol/kfontinst/kcmfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kcmfontinst/Makefile" ;; - "kcontrol/kfontinst/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfile-plugin/Makefile" ;; - "kcontrol/kfontinst/kfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfontinst/Makefile" ;; - "kcontrol/kfontinst/kio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kio/Makefile" ;; - "kcontrol/kfontinst/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/lib/Makefile" ;; - "kcontrol/kfontinst/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/thumbnail/Makefile" ;; - "kcontrol/kfontinst/viewpart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/viewpart/Makefile" ;; - "kcontrol/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kicker/Makefile" ;; - "kcontrol/kio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kio/Makefile" ;; - "kcontrol/kio/uasproviders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kio/uasproviders/Makefile" ;; - "kcontrol/knotify/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/Makefile" ;; - "kcontrol/knotify/sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/sounds/Makefile" ;; - "kcontrol/konq/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konq/Makefile" ;; - "kcontrol/konqhtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konqhtml/Makefile" ;; - "kcontrol/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konsole/Makefile" ;; - "kcontrol/krdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/Makefile" ;; - "kcontrol/krdb/ad/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/ad/Makefile" ;; - "kcontrol/krdb/kcs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/kcs/Makefile" ;; - "kcontrol/krdb/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/pics/Makefile" ;; - "kcontrol/krdb/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Makefile" ;; - "kcontrol/krdb/themes/HighContrastDark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark/Makefile" ;; - "kcontrol/krdb/themes/HighContrastDark-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark-big/Makefile" ;; - "kcontrol/krdb/themes/HighContrastLight/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight/Makefile" ;; - "kcontrol/krdb/themes/HighContrastLight-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight-big/Makefile" ;; - "kcontrol/krdb/themes/KDE_Classic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/KDE_Classic/Makefile" ;; - "kcontrol/krdb/themes/Keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Keramik/Makefile" ;; - "kcontrol/krdb/themes/Plastik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Plastik/Makefile" ;; - "kcontrol/krdb/themes/Platinum/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Platinum/Makefile" ;; - "kcontrol/krdb/themes/Redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Redmond/Makefile" ;; - "kcontrol/krdb/themes/Sunshine/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Sunshine/Makefile" ;; - "kcontrol/krdb/themes/YellowOnBlue/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue/Makefile" ;; - "kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ;; - "kcontrol/kthememanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kthememanager/Makefile" ;; - "kcontrol/launch/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/launch/Makefile" ;; - "kcontrol/locale/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/Makefile" ;; - "kcontrol/locale/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/default/Makefile" ;; - "kcontrol/locale/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/pics/Makefile" ;; - "kcontrol/nics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/nics/Makefile" ;; - "kcontrol/performance/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/performance/Makefile" ;; - "kcontrol/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/pics/Makefile" ;; - "kcontrol/privacy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/privacy/Makefile" ;; - "kcontrol/randr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/randr/Makefile" ;; - "kcontrol/samba/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/samba/Makefile" ;; - "kcontrol/screensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/screensaver/Makefile" ;; - "kcontrol/smartcard/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/smartcard/Makefile" ;; - "kcontrol/smserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/smserver/Makefile" ;; - "kcontrol/spellchecking/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/spellchecking/Makefile" ;; - "kcontrol/style/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/style/Makefile" ;; - "kcontrol/style/keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/style/keramik/Makefile" ;; - "kcontrol/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/taskbar/Makefile" ;; - "kcontrol/usbview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/usbview/Makefile" ;; - "kcontrol/view1394/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/view1394/Makefile" ;; - "kcontrol/xinerama/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/xinerama/Makefile" ;; - "kdcop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdcop/Makefile" ;; - "kdebugdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdebugdialog/Makefile" ;; - "kdeeject/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeeject/Makefile" ;; - "kdepasswd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/Makefile" ;; - "kdepasswd/kcm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/Makefile" ;; - "kdepasswd/kcm/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/pics/Makefile" ;; - "kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/Makefile" ;; - "kdeprint/descriptions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/descriptions/Makefile" ;; - "kdeprint/kdeprint_part/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprint_part/Makefile" ;; - "kdeprint/kdeprintfax/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprintfax/Makefile" ;; - "kdeprint/kjobviewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kjobviewer/Makefile" ;; - "kdeprint/kprinter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kprinter/Makefile" ;; - "kdeprint/printmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/printmgr/Makefile" ;; - "kdeprint/slave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/Makefile" ;; - "kdeprint/slave/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/mimetypes/Makefile" ;; - "kdeprint/slave/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/templates/Makefile" ;; - "kdesktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/Makefile" ;; - "kdesktop/init/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/init/Makefile" ;; - "kdesktop/init/Templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/init/Templates/Makefile" ;; - "kdesktop/kwebdesktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/kwebdesktop/Makefile" ;; - "kdesktop/lock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/lock/Makefile" ;; - "kdesktop/patterns/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/patterns/Makefile" ;; - "kdesktop/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/pics/Makefile" ;; - "kdesktop/programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/programs/Makefile" ;; - "kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/Makefile" ;; - "kdesu/kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/kdesu/Makefile" ;; - "kdesu/kdesud/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/kdesud/Makefile" ;; - "kdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdialog/Makefile" ;; - "kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/Makefile" ;; - "kdm/backend/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/backend/Makefile" ;; - "kdm/kfrontend/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/Makefile" ;; - "kdm/kfrontend/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/pics/Makefile" ;; - "kdm/kfrontend/sessions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/Makefile" ;; - "kdm/kfrontend/themer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themer/Makefile" ;; - "kdm/kfrontend/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/Makefile" ;; - "kdm/kfrontend/themes/circles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/circles/Makefile" ;; - "kdmlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdmlib/Makefile" ;; - "kfind/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfind/Makefile" ;; - "kfind/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfind/pics/Makefile" ;; - "khelpcenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/Makefile" ;; - "khelpcenter/htmlsearch/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/htmlsearch/Makefile" ;; - "khelpcenter/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/pics/Makefile" ;; - "khelpcenter/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Makefile" ;; - "khelpcenter/plugins/Applications/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Applications/Makefile" ;; - "khelpcenter/plugins/Manpages/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Manpages/Makefile" ;; - "khelpcenter/plugins/Scrollkeeper/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Scrollkeeper/Makefile" ;; - "khelpcenter/plugins/Tutorials/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Tutorials/Makefile" ;; - "khelpcenter/searchhandlers/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/Makefile" ;; - "khotkeys/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/Makefile" ;; - "khotkeys/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/app/Makefile" ;; - "khotkeys/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/arts/Makefile" ;; - "khotkeys/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/data/Makefile" ;; - "khotkeys/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/Makefile" ;; - "khotkeys/kcontrol/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/ui/Makefile" ;; - "khotkeys/shared/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/shared/Makefile" ;; - "khotkeys/update/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/update/Makefile" ;; - "kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/Makefile" ;; - "kicker/applets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/Makefile" ;; - "kicker/applets/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/clock/Makefile" ;; - "kicker/applets/launcher/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/launcher/Makefile" ;; - "kicker/applets/lockout/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/lockout/Makefile" ;; - "kicker/applets/media/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/media/Makefile" ;; - "kicker/applets/menu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/menu/Makefile" ;; - "kicker/applets/minipager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/minipager/Makefile" ;; - "kicker/applets/naughty/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/naughty/Makefile" ;; - "kicker/applets/run/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/run/Makefile" ;; - "kicker/applets/swallow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/swallow/Makefile" ;; - "kicker/applets/systemtray/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/systemtray/Makefile" ;; - "kicker/applets/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/taskbar/Makefile" ;; - "kicker/applets/trash/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/trash/Makefile" ;; - "kicker/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/Makefile" ;; - "kicker/data/app_start_anim/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/app_start_anim/Makefile" ;; - "kicker/data/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/icons/Makefile" ;; - "kicker/data/icons/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/icons/actions/Makefile" ;; - "kicker/data/kmenu_side/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/kmenu_side/Makefile" ;; - "kicker/data/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/tiles/Makefile" ;; - "kicker/data/wallpaper/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/wallpaper/Makefile" ;; - "kicker/extensions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/Makefile" ;; - "kicker/extensions/dockbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/dockbar/Makefile" ;; - "kicker/extensions/kasbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/kasbar/Makefile" ;; - "kicker/extensions/sidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/sidebar/Makefile" ;; - "kicker/extensions/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/taskbar/Makefile" ;; - "kicker/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/Makefile" ;; - "kicker/kicker/buttons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/buttons/Makefile" ;; - "kicker/kicker/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/core/Makefile" ;; - "kicker/kicker/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/ui/Makefile" ;; - "kicker/libkicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/libkicker/Makefile" ;; - "kicker/menuext/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/Makefile" ;; - "kicker/menuext/find/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/find/Makefile" ;; - "kicker/menuext/kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/kate/Makefile" ;; - "kicker/menuext/kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/kdeprint/Makefile" ;; - "kicker/menuext/konq-profiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/konq-profiles/Makefile" ;; - "kicker/menuext/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/konsole/Makefile" ;; - "kicker/menuext/prefmenu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/prefmenu/Makefile" ;; - "kicker/menuext/recentdocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/recentdocs/Makefile" ;; - "kicker/menuext/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/remote/Makefile" ;; - "kicker/menuext/system/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/system/Makefile" ;; - "kicker/menuext/tom/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/tom/Makefile" ;; - "kicker/proxy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/proxy/Makefile" ;; - "kicker/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/taskbar/Makefile" ;; - "kicker/taskmanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/taskmanager/Makefile" ;; - "kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/Makefile" ;; - "kioslave/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/about/Makefile" ;; - "kioslave/cgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/cgi/Makefile" ;; - "kioslave/cgi/kcmcgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/cgi/kcmcgi/Makefile" ;; - "kioslave/filter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/filter/Makefile" ;; - "kioslave/finger/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/finger/Makefile" ;; - "kioslave/fish/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/fish/Makefile" ;; - "kioslave/floppy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/floppy/Makefile" ;; - "kioslave/home/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/home/Makefile" ;; - "kioslave/home/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/home/kdedmodule/Makefile" ;; - "kioslave/info/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/info/Makefile" ;; - "kioslave/ldap/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/ldap/Makefile" ;; - "kioslave/mac/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/mac/Makefile" ;; - "kioslave/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/man/Makefile" ;; - "kioslave/media/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/Makefile" ;; - "kioslave/media/kcmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/kcmodule/Makefile" ;; - "kioslave/media/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/kfile-plugin/Makefile" ;; - "kioslave/media/libmediacommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/libmediacommon/Makefile" ;; - "kioslave/media/mediamanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mediamanager/Makefile" ;; - "kioslave/media/medianotifier/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/medianotifier/Makefile" ;; - "kioslave/media/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mimetypes/Makefile" ;; - "kioslave/media/mounthelper/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mounthelper/Makefile" ;; - "kioslave/media/propsdlgplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/propsdlgplugin/Makefile" ;; - "kioslave/media/services/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/services/Makefile" ;; - "kioslave/nfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/nfs/Makefile" ;; - "kioslave/nntp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/nntp/Makefile" ;; - "kioslave/pop3/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/pop3/Makefile" ;; - "kioslave/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/remote/Makefile" ;; - "kioslave/remote/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/remote/kdedmodule/Makefile" ;; - "kioslave/settings/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/settings/Makefile" ;; - "kioslave/sftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/sftp/Makefile" ;; - "kioslave/smb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/smb/Makefile" ;; - "kioslave/smtp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/smtp/Makefile" ;; - "kioslave/system/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/Makefile" ;; - "kioslave/system/entries/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/entries/Makefile" ;; - "kioslave/system/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/kdedmodule/Makefile" ;; - "kioslave/system/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/mimetypes/Makefile" ;; - "kioslave/tar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/tar/Makefile" ;; - "kioslave/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/thumbnail/Makefile" ;; - "kioslave/trash/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/trash/Makefile" ;; - "kioslave/trash/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/trash/kfile-plugin/Makefile" ;; - "klipper/Makefile" ) CONFIG_FILES="$CONFIG_FILES klipper/Makefile" ;; - "kmenuedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmenuedit/Makefile" ;; - "kmenuedit/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmenuedit/pixmaps/Makefile" ;; - "knetattach/Makefile" ) CONFIG_FILES="$CONFIG_FILES knetattach/Makefile" ;; - "konqueror/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/Makefile" ;; - "konqueror/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/about/Makefile" ;; - "konqueror/client/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/client/Makefile" ;; - "konqueror/iconview/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/iconview/Makefile" ;; - "konqueror/keditbookmarks/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/keditbookmarks/Makefile" ;; - "konqueror/kttsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/kttsplugin/Makefile" ;; - "konqueror/listview/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/listview/Makefile" ;; - "konqueror/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/Makefile" ;; - "konqueror/pics/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/actions/Makefile" ;; - "konqueror/pics/indicators/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/indicators/Makefile" ;; - "konqueror/pics/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/tiles/Makefile" ;; - "konqueror/preloader/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/preloader/Makefile" ;; - "konqueror/quickprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/quickprint/Makefile" ;; - "konqueror/remoteencodingplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/remoteencodingplugin/Makefile" ;; - "konqueror/shellcmdplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/shellcmdplugin/Makefile" ;; - "konqueror/sidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/Makefile" ;; - "konqueror/sidebar/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/test/Makefile" ;; - "konqueror/sidebar/trees/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/Makefile" ;; - "konqueror/sidebar/trees/bookmark_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/bookmark_module/Makefile" ;; - "konqueror/sidebar/trees/dirtree_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/dirtree_module/Makefile" ;; - "konqueror/sidebar/trees/history_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/history_module/Makefile" ;; - "konqueror/sidebar/trees/init/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/Makefile" ;; - "konqueror/sidebar/trees/init/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/Makefile" ;; - "konqueror/sidebar/trees/init/remote/ftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/ftp/Makefile" ;; - "konqueror/sidebar/trees/init/remote/web/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/web/Makefile" ;; - "konqueror/sidebar/trees/init/services/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/services/Makefile" ;; - "konqueror/sidebar/web_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/web_module/Makefile" ;; - "konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/Makefile" ;; - "konsole/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/doc/Makefile" ;; - "konsole/doc/VT100/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/doc/VT100/Makefile" ;; - "konsole/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/fonts/Makefile" ;; - "konsole/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/konsole/Makefile" ;; - "konsole/other/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/Makefile" ;; - "konsole/other/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/icons/Makefile" ;; - "konsole/other/wallpapers/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/wallpapers/Makefile" ;; - "kpager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpager/Makefile" ;; - "kpersonalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpersonalizer/Makefile" ;; - "kpersonalizer/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpersonalizer/pics/Makefile" ;; - "kreadconfig/Makefile" ) CONFIG_FILES="$CONFIG_FILES kreadconfig/Makefile" ;; - "kscreensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscreensaver/Makefile" ;; - "ksmserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksmserver/Makefile" ;; - "ksplashml/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/Makefile" ;; - "ksplashml/kcmksplash/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/Makefile" ;; - "ksplashml/kcmksplash/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/pics/Makefile" ;; - "ksplashml/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/Makefile" ;; - "ksplashml/pics/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/Makefile" ;; - "ksplashml/pics/themes/blue-bend/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/blue-bend/Makefile" ;; - "ksplashml/pics/themes/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/Makefile" ;; - "ksplashml/pics/themes/default/locolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/locolor/Makefile" ;; - "ksplashml/pics/themes/none/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/none/Makefile" ;; - "ksplashml/pics/themes/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/simple/Makefile" ;; - "ksplashml/themeengine/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/Makefile" ;; - "ksplashml/themeengine/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/default/Makefile" ;; - "ksplashml/themeengine/redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/Makefile" ;; - "ksplashml/themeengine/redmond/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/pics/Makefile" ;; - "ksplashml/themeengine/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/simple/Makefile" ;; - "ksplashml/themeengine/standard/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/Makefile" ;; - "ksplashml/themeengine/standard/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/pics/Makefile" ;; - "kstart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kstart/Makefile" ;; - "ksysguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/Makefile" ;; - "ksysguard/CContLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/CContLib/Makefile" ;; - "ksysguard/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/example/Makefile" ;; - "ksysguard/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/Makefile" ;; - "ksysguard/gui/SensorDisplayLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/SensorDisplayLib/Makefile" ;; - "ksysguard/gui/ksgrd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/ksgrd/Makefile" ;; - "ksysguard/ksysguardd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Makefile" ;; - "ksysguard/ksysguardd/FreeBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/FreeBSD/Makefile" ;; - "ksysguard/ksysguardd/Irix/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Irix/Makefile" ;; - "ksysguard/ksysguardd/Linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Linux/Makefile" ;; - "ksysguard/ksysguardd/NetBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/NetBSD/Makefile" ;; - "ksysguard/ksysguardd/OpenBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/OpenBSD/Makefile" ;; - "ksysguard/ksysguardd/Solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Solaris/Makefile" ;; - "ksysguard/ksysguardd/Tru64/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Tru64/Makefile" ;; - "ksysguard/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/pics/Makefile" ;; - "ksystraycmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksystraycmd/Makefile" ;; - "ktip/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktip/Makefile" ;; - "ktip/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktip/pics/Makefile" ;; - "kwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/Makefile" ;; - "kwin/clients/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/Makefile" ;; - "kwin/clients/b2/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/Makefile" ;; - "kwin/clients/b2/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/config/Makefile" ;; - "kwin/clients/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/default/Makefile" ;; - "kwin/clients/default/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/default/config/Makefile" ;; - "kwin/clients/keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/Makefile" ;; - "kwin/clients/keramik/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/config/Makefile" ;; - "kwin/clients/kwmtheme/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/Makefile" ;; - "kwin/clients/kwmtheme/cli_installer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/cli_installer/Makefile" ;; - "kwin/clients/laptop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/laptop/Makefile" ;; - "kwin/clients/modernsystem/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/Makefile" ;; - "kwin/clients/modernsystem/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/config/Makefile" ;; - "kwin/clients/plastik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/Makefile" ;; - "kwin/clients/plastik/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/config/Makefile" ;; - "kwin/clients/quartz/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/Makefile" ;; - "kwin/clients/quartz/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/config/Makefile" ;; - "kwin/clients/redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/redmond/Makefile" ;; - "kwin/clients/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/test/Makefile" ;; - "kwin/clients/web/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/web/Makefile" ;; - "kwin/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/data/Makefile" ;; - "kwin/kcmkwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/Makefile" ;; - "kwin/kcmkwin/kwindecoration/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwindecoration/Makefile" ;; - "kwin/kcmkwin/kwinoptions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinoptions/Makefile" ;; - "kwin/kcmkwin/kwinrules/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinrules/Makefile" ;; - "kwin/killer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/killer/Makefile" ;; - "kwin/kompmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kompmgr/Makefile" ;; - "kwin/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/lib/Makefile" ;; - "kwin/oldheaders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/oldheaders/Makefile" ;; - "kwin/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/pics/Makefile" ;; - "kwin/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/tools/Makefile" ;; - "kwin/tools/decobenchmark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/tools/decobenchmark/Makefile" ;; - "kxkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kxkb/Makefile" ;; - "kxkb/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kxkb/pics/Makefile" ;; - "l10n/Makefile" ) CONFIG_FILES="$CONFIG_FILES l10n/Makefile" ;; - "libkonq/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/Makefile" ;; - "libkonq/favicons/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/favicons/Makefile" ;; - "libkonq/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/pics/Makefile" ;; - "libkonq/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/tests/Makefile" ;; - "nsplugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/Makefile" ;; - "nsplugins/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/test/Makefile" ;; - "nsplugins/viewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/viewer/Makefile" ;; - "nsplugins/wrapper/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/wrapper/Makefile" ;; - "pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;; - "pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;; - "pics/wallpapers/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/wallpapers/Makefile" ;; - "kdm/kfrontend/sessions/kde.desktop" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/kde.desktop" ;; - "khelpcenter/searchhandlers/khc_docbookdig.pl" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_docbookdig.pl" ;; - "khelpcenter/searchhandlers/khc_htdig.pl" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_htdig.pl" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "applnk/Makefile") CONFIG_FILES="$CONFIG_FILES applnk/Makefile" ;; + "applnk/compat/Makefile") CONFIG_FILES="$CONFIG_FILES applnk/compat/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/faq/Makefile") CONFIG_FILES="$CONFIG_FILES doc/faq/Makefile" ;; + "doc/glossary/Makefile") CONFIG_FILES="$CONFIG_FILES doc/glossary/Makefile" ;; + "doc/kappfinder/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kappfinder/Makefile" ;; + "doc/kate/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kate/Makefile" ;; + "doc/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/Makefile" ;; + "doc/kcontrol/arts/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/arts/Makefile" ;; + "doc/kcontrol/background/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/background/Makefile" ;; + "doc/kcontrol/bell/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/bell/Makefile" ;; + "doc/kcontrol/cache/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cache/Makefile" ;; + "doc/kcontrol/clock/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/clock/Makefile" ;; + "doc/kcontrol/colors/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/colors/Makefile" ;; + "doc/kcontrol/cookies/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cookies/Makefile" ;; + "doc/kcontrol/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/crypto/Makefile" ;; + "doc/kcontrol/desktop/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktop/Makefile" ;; + "doc/kcontrol/desktopbehavior/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktopbehavior/Makefile" ;; + "doc/kcontrol/ebrowsing/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/ebrowsing/Makefile" ;; + "doc/kcontrol/email/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/email/Makefile" ;; + "doc/kcontrol/energy/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/energy/Makefile" ;; + "doc/kcontrol/filemanager/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filemanager/Makefile" ;; + "doc/kcontrol/filetypes/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filetypes/Makefile" ;; + "doc/kcontrol/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/fonts/Makefile" ;; + "doc/kcontrol/helpindex/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/helpindex/Makefile" ;; + "doc/kcontrol/icons/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/icons/Makefile" ;; + "doc/kcontrol/kcmaccess/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmaccess/Makefile" ;; + "doc/kcontrol/kcmcss/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmcss/Makefile" ;; + "doc/kcontrol/kcmfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmfontinst/Makefile" ;; + "doc/kcontrol/kcmkonsole/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmkonsole/Makefile" ;; + "doc/kcontrol/kcmlaunch/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmlaunch/Makefile" ;; + "doc/kcontrol/kcmnotify/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmnotify/Makefile" ;; + "doc/kcontrol/kcmsmserver/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmsmserver/Makefile" ;; + "doc/kcontrol/kcmstyle/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmstyle/Makefile" ;; + "doc/kcontrol/kcmtaskbar/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmtaskbar/Makefile" ;; + "doc/kcontrol/kdm/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kdm/Makefile" ;; + "doc/kcontrol/keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keyboard/Makefile" ;; + "doc/kcontrol/keys/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keys/Makefile" ;; + "doc/kcontrol/khtml/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/khtml/Makefile" ;; + "doc/kcontrol/kwindecoration/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kwindecoration/Makefile" ;; + "doc/kcontrol/language/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/language/Makefile" ;; + "doc/kcontrol/mouse/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/mouse/Makefile" ;; + "doc/kcontrol/netpref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/netpref/Makefile" ;; + "doc/kcontrol/panel/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panel/Makefile" ;; + "doc/kcontrol/panelappearance/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panelappearance/Makefile" ;; + "doc/kcontrol/passwords/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/passwords/Makefile" ;; + "doc/kcontrol/performance/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/performance/Makefile" ;; + "doc/kcontrol/proxy/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/proxy/Makefile" ;; + "doc/kcontrol/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/screensaver/Makefile" ;; + "doc/kcontrol/smb/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/smb/Makefile" ;; + "doc/kcontrol/spellchecking/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/spellchecking/Makefile" ;; + "doc/kcontrol/useragent/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/useragent/Makefile" ;; + "doc/kcontrol/windowmanagement/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/windowmanagement/Makefile" ;; + "doc/kdcop/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdcop/Makefile" ;; + "doc/kdebugdialog/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdebugdialog/Makefile" ;; + "doc/kdeprint/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdeprint/Makefile" ;; + "doc/kdesu/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdesu/Makefile" ;; + "doc/kdm/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdm/Makefile" ;; + "doc/kfind/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kfind/Makefile" ;; + "doc/khelpcenter/Makefile") CONFIG_FILES="$CONFIG_FILES doc/khelpcenter/Makefile" ;; + "doc/kicker/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kicker/Makefile" ;; + "doc/kinfocenter/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/Makefile" ;; + "doc/kinfocenter/cdinfo/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/cdinfo/Makefile" ;; + "doc/kinfocenter/devices/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/devices/Makefile" ;; + "doc/kinfocenter/dma/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/dma/Makefile" ;; + "doc/kinfocenter/interrupts/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/interrupts/Makefile" ;; + "doc/kinfocenter/ioports/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/ioports/Makefile" ;; + "doc/kinfocenter/memory/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/memory/Makefile" ;; + "doc/kinfocenter/nics/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/nics/Makefile" ;; + "doc/kinfocenter/opengl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/opengl/Makefile" ;; + "doc/kinfocenter/partitions/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/partitions/Makefile" ;; + "doc/kinfocenter/pci/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pci/Makefile" ;; + "doc/kinfocenter/pcmcia/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pcmcia/Makefile" ;; + "doc/kinfocenter/processor/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/processor/Makefile" ;; + "doc/kinfocenter/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/protocols/Makefile" ;; + "doc/kinfocenter/samba/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/samba/Makefile" ;; + "doc/kinfocenter/scsi/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/scsi/Makefile" ;; + "doc/kinfocenter/sound/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/sound/Makefile" ;; + "doc/kinfocenter/usb/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/usb/Makefile" ;; + "doc/kinfocenter/xserver/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/xserver/Makefile" ;; + "doc/kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kioslave/Makefile" ;; + "doc/klipper/Makefile") CONFIG_FILES="$CONFIG_FILES doc/klipper/Makefile" ;; + "doc/kmenuedit/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kmenuedit/Makefile" ;; + "doc/knetattach/Makefile") CONFIG_FILES="$CONFIG_FILES doc/knetattach/Makefile" ;; + "doc/kompmgr/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kompmgr/Makefile" ;; + "doc/konqueror/Makefile") CONFIG_FILES="$CONFIG_FILES doc/konqueror/Makefile" ;; + "doc/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES doc/konsole/Makefile" ;; + "doc/kpager/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kpager/Makefile" ;; + "doc/ksplashml/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ksplashml/Makefile" ;; + "doc/ksysguard/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ksysguard/Makefile" ;; + "doc/kwrite/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kwrite/Makefile" ;; + "doc/kxkb/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kxkb/Makefile" ;; + "doc/quickstart/Makefile") CONFIG_FILES="$CONFIG_FILES doc/quickstart/Makefile" ;; + "doc/userguide/Makefile") CONFIG_FILES="$CONFIG_FILES doc/userguide/Makefile" ;; + "doc/visualdict/Makefile") CONFIG_FILES="$CONFIG_FILES doc/visualdict/Makefile" ;; + "drkonqi/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/Makefile" ;; + "drkonqi/debuggers/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/debuggers/Makefile" ;; + "drkonqi/pics/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/pics/Makefile" ;; + "drkonqi/presets/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/presets/Makefile" ;; + "kappfinder/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/Makefile" ;; + "kappfinder/apps/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Makefile" ;; + "kappfinder/apps/Development/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Development/Makefile" ;; + "kappfinder/apps/Games/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Makefile" ;; + "kappfinder/apps/Games/Arcade/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Arcade/Makefile" ;; + "kappfinder/apps/Games/Board/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Board/Makefile" ;; + "kappfinder/apps/Games/Card/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Card/Makefile" ;; + "kappfinder/apps/Games/Emulators/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Emulators/Makefile" ;; + "kappfinder/apps/Games/Roguelikes/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Roguelikes/Makefile" ;; + "kappfinder/apps/Games/TacticStrategy/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/TacticStrategy/Makefile" ;; + "kappfinder/apps/Games/Toys/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Toys/Makefile" ;; + "kappfinder/apps/Graphics/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Graphics/Makefile" ;; + "kappfinder/apps/Internet/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Makefile" ;; + "kappfinder/apps/Internet/Terminal/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Terminal/Makefile" ;; + "kappfinder/apps/Multimedia/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Multimedia/Makefile" ;; + "kappfinder/apps/Office/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Office/Makefile" ;; + "kappfinder/apps/System/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Makefile" ;; + "kappfinder/apps/System/Terminal/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Terminal/Makefile" ;; + "kappfinder/apps/Utilities/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Makefile" ;; + "kappfinder/apps/Utilities/Editors/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Editors/Makefile" ;; + "kappfinder/apps/Utilities/xutils/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/xutils/Makefile" ;; + "kate/Makefile") CONFIG_FILES="$CONFIG_FILES kate/Makefile" ;; + "kate/app/Makefile") CONFIG_FILES="$CONFIG_FILES kate/app/Makefile" ;; + "kate/data/Makefile") CONFIG_FILES="$CONFIG_FILES kate/data/Makefile" ;; + "kate/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES kate/interfaces/Makefile" ;; + "kate/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kate/pics/Makefile" ;; + "kate/pics/actions/Makefile") CONFIG_FILES="$CONFIG_FILES kate/pics/actions/Makefile" ;; + "kate/utils/Makefile") CONFIG_FILES="$CONFIG_FILES kate/utils/Makefile" ;; + "kcheckpass/Makefile") CONFIG_FILES="$CONFIG_FILES kcheckpass/Makefile" ;; + "kcminit/Makefile") CONFIG_FILES="$CONFIG_FILES kcminit/Makefile" ;; + "kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/Makefile" ;; + "kcontrol/access/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/access/Makefile" ;; + "kcontrol/accessibility/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/accessibility/Makefile" ;; + "kcontrol/arts/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/arts/Makefile" ;; + "kcontrol/background/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/background/Makefile" ;; + "kcontrol/background/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/background/pics/Makefile" ;; + "kcontrol/bell/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/bell/Makefile" ;; + "kcontrol/clock/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/clock/Makefile" ;; + "kcontrol/colors/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/colors/Makefile" ;; + "kcontrol/componentchooser/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/Makefile" ;; + "kcontrol/componentchooser/componentservices/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/componentservices/Makefile" ;; + "kcontrol/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/crypto/Makefile" ;; + "kcontrol/css/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/css/Makefile" ;; + "kcontrol/display/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/display/Makefile" ;; + "kcontrol/dnssd/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/dnssd/Makefile" ;; + "kcontrol/ebrowsing/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/Makefile" ;; + "kcontrol/ebrowsing/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/Makefile" ;; + "kcontrol/ebrowsing/plugins/ikws/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/Makefile" ;; + "kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ;; + "kcontrol/ebrowsing/plugins/localdomain/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/localdomain/Makefile" ;; + "kcontrol/ebrowsing/plugins/shorturi/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/shorturi/Makefile" ;; + "kcontrol/energy/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/energy/Makefile" ;; + "kcontrol/energy/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/energy/pics/Makefile" ;; + "kcontrol/filetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/filetypes/Makefile" ;; + "kcontrol/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/fonts/Makefile" ;; + "kcontrol/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/icons/Makefile" ;; + "kcontrol/info/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/info/Makefile" ;; + "kcontrol/input/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/Makefile" ;; + "kcontrol/input/core/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/core/Makefile" ;; + "kcontrol/input/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/pics/Makefile" ;; + "kcontrol/input/xcursor/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/xcursor/Makefile" ;; + "kcontrol/ioslaveinfo/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ioslaveinfo/Makefile" ;; + "kcontrol/joystick/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/joystick/Makefile" ;; + "kcontrol/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/Makefile" ;; + "kcontrol/kcontrol/about/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/about/Makefile" ;; + "kcontrol/kded/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kded/Makefile" ;; + "kcontrol/kdm/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kdm/Makefile" ;; + "kcontrol/keys/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/keys/Makefile" ;; + "kcontrol/kfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/Makefile" ;; + "kcontrol/kfontinst/kcmfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kcmfontinst/Makefile" ;; + "kcontrol/kfontinst/kfile-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfile-plugin/Makefile" ;; + "kcontrol/kfontinst/kfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfontinst/Makefile" ;; + "kcontrol/kfontinst/kio/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kio/Makefile" ;; + "kcontrol/kfontinst/lib/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/lib/Makefile" ;; + "kcontrol/kfontinst/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/thumbnail/Makefile" ;; + "kcontrol/kfontinst/viewpart/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/viewpart/Makefile" ;; + "kcontrol/kicker/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kicker/Makefile" ;; + "kcontrol/kio/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kio/Makefile" ;; + "kcontrol/kio/uasproviders/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kio/uasproviders/Makefile" ;; + "kcontrol/knotify/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/Makefile" ;; + "kcontrol/knotify/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/sounds/Makefile" ;; + "kcontrol/konq/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/konq/Makefile" ;; + "kcontrol/konqhtml/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/konqhtml/Makefile" ;; + "kcontrol/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/konsole/Makefile" ;; + "kcontrol/krdb/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/Makefile" ;; + "kcontrol/krdb/ad/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/ad/Makefile" ;; + "kcontrol/krdb/kcs/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/kcs/Makefile" ;; + "kcontrol/krdb/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/pics/Makefile" ;; + "kcontrol/krdb/themes/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Makefile" ;; + "kcontrol/krdb/themes/HighContrastDark/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark/Makefile" ;; + "kcontrol/krdb/themes/HighContrastDark-big/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark-big/Makefile" ;; + "kcontrol/krdb/themes/HighContrastLight/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight/Makefile" ;; + "kcontrol/krdb/themes/HighContrastLight-big/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight-big/Makefile" ;; + "kcontrol/krdb/themes/KDE_Classic/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/KDE_Classic/Makefile" ;; + "kcontrol/krdb/themes/Keramik/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Keramik/Makefile" ;; + "kcontrol/krdb/themes/Plastik/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Plastik/Makefile" ;; + "kcontrol/krdb/themes/Platinum/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Platinum/Makefile" ;; + "kcontrol/krdb/themes/Redmond/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Redmond/Makefile" ;; + "kcontrol/krdb/themes/Sunshine/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Sunshine/Makefile" ;; + "kcontrol/krdb/themes/YellowOnBlue/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue/Makefile" ;; + "kcontrol/krdb/themes/YellowOnBlue-big/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ;; + "kcontrol/kthememanager/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kthememanager/Makefile" ;; + "kcontrol/launch/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/launch/Makefile" ;; + "kcontrol/locale/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/locale/Makefile" ;; + "kcontrol/locale/default/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/locale/default/Makefile" ;; + "kcontrol/locale/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/locale/pics/Makefile" ;; + "kcontrol/nics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/nics/Makefile" ;; + "kcontrol/performance/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/performance/Makefile" ;; + "kcontrol/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/pics/Makefile" ;; + "kcontrol/privacy/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/privacy/Makefile" ;; + "kcontrol/randr/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/randr/Makefile" ;; + "kcontrol/samba/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/samba/Makefile" ;; + "kcontrol/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/screensaver/Makefile" ;; + "kcontrol/smartcard/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/smartcard/Makefile" ;; + "kcontrol/smserver/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/smserver/Makefile" ;; + "kcontrol/spellchecking/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/spellchecking/Makefile" ;; + "kcontrol/style/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/style/Makefile" ;; + "kcontrol/style/keramik/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/style/keramik/Makefile" ;; + "kcontrol/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/taskbar/Makefile" ;; + "kcontrol/usbview/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/usbview/Makefile" ;; + "kcontrol/view1394/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/view1394/Makefile" ;; + "kcontrol/xinerama/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/xinerama/Makefile" ;; + "kdcop/Makefile") CONFIG_FILES="$CONFIG_FILES kdcop/Makefile" ;; + "kdebugdialog/Makefile") CONFIG_FILES="$CONFIG_FILES kdebugdialog/Makefile" ;; + "kdeeject/Makefile") CONFIG_FILES="$CONFIG_FILES kdeeject/Makefile" ;; + "kdepasswd/Makefile") CONFIG_FILES="$CONFIG_FILES kdepasswd/Makefile" ;; + "kdepasswd/kcm/Makefile") CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/Makefile" ;; + "kdepasswd/kcm/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/pics/Makefile" ;; + "kdeprint/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/Makefile" ;; + "kdeprint/descriptions/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/descriptions/Makefile" ;; + "kdeprint/kdeprint_part/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprint_part/Makefile" ;; + "kdeprint/kdeprintfax/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprintfax/Makefile" ;; + "kdeprint/kjobviewer/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kjobviewer/Makefile" ;; + "kdeprint/kprinter/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kprinter/Makefile" ;; + "kdeprint/printmgr/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/printmgr/Makefile" ;; + "kdeprint/slave/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/slave/Makefile" ;; + "kdeprint/slave/mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/slave/mimetypes/Makefile" ;; + "kdeprint/slave/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/slave/templates/Makefile" ;; + "kdesktop/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/Makefile" ;; + "kdesktop/init/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/init/Makefile" ;; + "kdesktop/init/Templates/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/init/Templates/Makefile" ;; + "kdesktop/kwebdesktop/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/kwebdesktop/Makefile" ;; + "kdesktop/lock/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/lock/Makefile" ;; + "kdesktop/patterns/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/patterns/Makefile" ;; + "kdesktop/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/pics/Makefile" ;; + "kdesktop/programs/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/programs/Makefile" ;; + "kdesu/Makefile") CONFIG_FILES="$CONFIG_FILES kdesu/Makefile" ;; + "kdesu/kdesu/Makefile") CONFIG_FILES="$CONFIG_FILES kdesu/kdesu/Makefile" ;; + "kdesu/kdesud/Makefile") CONFIG_FILES="$CONFIG_FILES kdesu/kdesud/Makefile" ;; + "kdialog/Makefile") CONFIG_FILES="$CONFIG_FILES kdialog/Makefile" ;; + "kdm/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/Makefile" ;; + "kdm/backend/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/backend/Makefile" ;; + "kdm/kfrontend/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/Makefile" ;; + "kdm/kfrontend/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/pics/Makefile" ;; + "kdm/kfrontend/sessions/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/Makefile" ;; + "kdm/kfrontend/themer/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themer/Makefile" ;; + "kdm/kfrontend/themes/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/Makefile" ;; + "kdm/kfrontend/themes/circles/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/circles/Makefile" ;; + "kdmlib/Makefile") CONFIG_FILES="$CONFIG_FILES kdmlib/Makefile" ;; + "kfind/Makefile") CONFIG_FILES="$CONFIG_FILES kfind/Makefile" ;; + "kfind/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kfind/pics/Makefile" ;; + "khelpcenter/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/Makefile" ;; + "khelpcenter/htmlsearch/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/htmlsearch/Makefile" ;; + "khelpcenter/pics/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/pics/Makefile" ;; + "khelpcenter/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Makefile" ;; + "khelpcenter/plugins/Applications/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Applications/Makefile" ;; + "khelpcenter/plugins/Manpages/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Manpages/Makefile" ;; + "khelpcenter/plugins/Scrollkeeper/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Scrollkeeper/Makefile" ;; + "khelpcenter/plugins/Tutorials/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Tutorials/Makefile" ;; + "khelpcenter/searchhandlers/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/Makefile" ;; + "khotkeys/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/Makefile" ;; + "khotkeys/app/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/app/Makefile" ;; + "khotkeys/arts/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/arts/Makefile" ;; + "khotkeys/data/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/data/Makefile" ;; + "khotkeys/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/Makefile" ;; + "khotkeys/kcontrol/ui/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/ui/Makefile" ;; + "khotkeys/shared/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/shared/Makefile" ;; + "khotkeys/update/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/update/Makefile" ;; + "kicker/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/Makefile" ;; + "kicker/applets/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/Makefile" ;; + "kicker/applets/clock/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/clock/Makefile" ;; + "kicker/applets/launcher/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/launcher/Makefile" ;; + "kicker/applets/lockout/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/lockout/Makefile" ;; + "kicker/applets/media/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/media/Makefile" ;; + "kicker/applets/menu/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/menu/Makefile" ;; + "kicker/applets/minipager/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/minipager/Makefile" ;; + "kicker/applets/naughty/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/naughty/Makefile" ;; + "kicker/applets/run/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/run/Makefile" ;; + "kicker/applets/swallow/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/swallow/Makefile" ;; + "kicker/applets/systemtray/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/systemtray/Makefile" ;; + "kicker/applets/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/taskbar/Makefile" ;; + "kicker/applets/trash/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/trash/Makefile" ;; + "kicker/data/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/Makefile" ;; + "kicker/data/app_start_anim/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/app_start_anim/Makefile" ;; + "kicker/data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/icons/Makefile" ;; + "kicker/data/icons/actions/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/icons/actions/Makefile" ;; + "kicker/data/kmenu_side/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/kmenu_side/Makefile" ;; + "kicker/data/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/tiles/Makefile" ;; + "kicker/data/wallpaper/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/wallpaper/Makefile" ;; + "kicker/extensions/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/Makefile" ;; + "kicker/extensions/dockbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/dockbar/Makefile" ;; + "kicker/extensions/kasbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/kasbar/Makefile" ;; + "kicker/extensions/sidebar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/sidebar/Makefile" ;; + "kicker/extensions/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/taskbar/Makefile" ;; + "kicker/kicker/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/Makefile" ;; + "kicker/kicker/buttons/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/buttons/Makefile" ;; + "kicker/kicker/core/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/core/Makefile" ;; + "kicker/kicker/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/ui/Makefile" ;; + "kicker/libkicker/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/libkicker/Makefile" ;; + "kicker/menuext/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/Makefile" ;; + "kicker/menuext/find/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/find/Makefile" ;; + "kicker/menuext/kate/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/kate/Makefile" ;; + "kicker/menuext/kdeprint/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/kdeprint/Makefile" ;; + "kicker/menuext/konq-profiles/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/konq-profiles/Makefile" ;; + "kicker/menuext/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/konsole/Makefile" ;; + "kicker/menuext/prefmenu/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/prefmenu/Makefile" ;; + "kicker/menuext/recentdocs/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/recentdocs/Makefile" ;; + "kicker/menuext/remote/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/remote/Makefile" ;; + "kicker/menuext/system/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/system/Makefile" ;; + "kicker/menuext/tom/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/tom/Makefile" ;; + "kicker/proxy/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/proxy/Makefile" ;; + "kicker/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/taskbar/Makefile" ;; + "kicker/taskmanager/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/taskmanager/Makefile" ;; + "kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/Makefile" ;; + "kioslave/about/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/about/Makefile" ;; + "kioslave/cgi/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/cgi/Makefile" ;; + "kioslave/cgi/kcmcgi/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/cgi/kcmcgi/Makefile" ;; + "kioslave/filter/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/filter/Makefile" ;; + "kioslave/finger/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/finger/Makefile" ;; + "kioslave/fish/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/fish/Makefile" ;; + "kioslave/floppy/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/floppy/Makefile" ;; + "kioslave/home/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/home/Makefile" ;; + "kioslave/home/kdedmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/home/kdedmodule/Makefile" ;; + "kioslave/info/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/info/Makefile" ;; + "kioslave/ldap/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/ldap/Makefile" ;; + "kioslave/mac/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/mac/Makefile" ;; + "kioslave/man/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/man/Makefile" ;; + "kioslave/media/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/Makefile" ;; + "kioslave/media/kcmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/kcmodule/Makefile" ;; + "kioslave/media/kfile-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/kfile-plugin/Makefile" ;; + "kioslave/media/libmediacommon/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/libmediacommon/Makefile" ;; + "kioslave/media/mediamanager/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/mediamanager/Makefile" ;; + "kioslave/media/medianotifier/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/medianotifier/Makefile" ;; + "kioslave/media/mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/mimetypes/Makefile" ;; + "kioslave/media/mounthelper/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/mounthelper/Makefile" ;; + "kioslave/media/propsdlgplugin/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/propsdlgplugin/Makefile" ;; + "kioslave/media/services/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/services/Makefile" ;; + "kioslave/nfs/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/nfs/Makefile" ;; + "kioslave/nntp/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/nntp/Makefile" ;; + "kioslave/pop3/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/pop3/Makefile" ;; + "kioslave/remote/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/remote/Makefile" ;; + "kioslave/remote/kdedmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/remote/kdedmodule/Makefile" ;; + "kioslave/settings/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/settings/Makefile" ;; + "kioslave/sftp/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/sftp/Makefile" ;; + "kioslave/smb/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/smb/Makefile" ;; + "kioslave/smtp/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/smtp/Makefile" ;; + "kioslave/system/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/Makefile" ;; + "kioslave/system/entries/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/entries/Makefile" ;; + "kioslave/system/kdedmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/kdedmodule/Makefile" ;; + "kioslave/system/mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/mimetypes/Makefile" ;; + "kioslave/tar/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/tar/Makefile" ;; + "kioslave/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/thumbnail/Makefile" ;; + "kioslave/trash/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/trash/Makefile" ;; + "kioslave/trash/kfile-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/trash/kfile-plugin/Makefile" ;; + "klipper/Makefile") CONFIG_FILES="$CONFIG_FILES klipper/Makefile" ;; + "kmenuedit/Makefile") CONFIG_FILES="$CONFIG_FILES kmenuedit/Makefile" ;; + "kmenuedit/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES kmenuedit/pixmaps/Makefile" ;; + "knetattach/Makefile") CONFIG_FILES="$CONFIG_FILES knetattach/Makefile" ;; + "konqueror/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/Makefile" ;; + "konqueror/about/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/about/Makefile" ;; + "konqueror/client/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/client/Makefile" ;; + "konqueror/iconview/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/iconview/Makefile" ;; + "konqueror/keditbookmarks/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/keditbookmarks/Makefile" ;; + "konqueror/kttsplugin/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/kttsplugin/Makefile" ;; + "konqueror/listview/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/listview/Makefile" ;; + "konqueror/pics/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/Makefile" ;; + "konqueror/pics/actions/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/actions/Makefile" ;; + "konqueror/pics/indicators/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/indicators/Makefile" ;; + "konqueror/pics/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/tiles/Makefile" ;; + "konqueror/preloader/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/preloader/Makefile" ;; + "konqueror/quickprint/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/quickprint/Makefile" ;; + "konqueror/remoteencodingplugin/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/remoteencodingplugin/Makefile" ;; + "konqueror/shellcmdplugin/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/shellcmdplugin/Makefile" ;; + "konqueror/sidebar/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/Makefile" ;; + "konqueror/sidebar/test/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/test/Makefile" ;; + "konqueror/sidebar/trees/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/Makefile" ;; + "konqueror/sidebar/trees/bookmark_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/bookmark_module/Makefile" ;; + "konqueror/sidebar/trees/dirtree_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/dirtree_module/Makefile" ;; + "konqueror/sidebar/trees/history_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/history_module/Makefile" ;; + "konqueror/sidebar/trees/init/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/Makefile" ;; + "konqueror/sidebar/trees/init/remote/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/Makefile" ;; + "konqueror/sidebar/trees/init/remote/ftp/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/ftp/Makefile" ;; + "konqueror/sidebar/trees/init/remote/web/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/web/Makefile" ;; + "konqueror/sidebar/trees/init/services/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/services/Makefile" ;; + "konqueror/sidebar/web_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/web_module/Makefile" ;; + "konsole/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/Makefile" ;; + "konsole/doc/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/doc/Makefile" ;; + "konsole/doc/VT100/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/doc/VT100/Makefile" ;; + "konsole/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/fonts/Makefile" ;; + "konsole/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/konsole/Makefile" ;; + "konsole/other/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/other/Makefile" ;; + "konsole/other/icons/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/other/icons/Makefile" ;; + "konsole/other/wallpapers/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/other/wallpapers/Makefile" ;; + "kpager/Makefile") CONFIG_FILES="$CONFIG_FILES kpager/Makefile" ;; + "kpersonalizer/Makefile") CONFIG_FILES="$CONFIG_FILES kpersonalizer/Makefile" ;; + "kpersonalizer/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kpersonalizer/pics/Makefile" ;; + "kreadconfig/Makefile") CONFIG_FILES="$CONFIG_FILES kreadconfig/Makefile" ;; + "kscreensaver/Makefile") CONFIG_FILES="$CONFIG_FILES kscreensaver/Makefile" ;; + "ksmserver/Makefile") CONFIG_FILES="$CONFIG_FILES ksmserver/Makefile" ;; + "ksplashml/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/Makefile" ;; + "ksplashml/kcmksplash/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/Makefile" ;; + "ksplashml/kcmksplash/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/pics/Makefile" ;; + "ksplashml/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/Makefile" ;; + "ksplashml/pics/themes/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/Makefile" ;; + "ksplashml/pics/themes/blue-bend/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/blue-bend/Makefile" ;; + "ksplashml/pics/themes/default/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/Makefile" ;; + "ksplashml/pics/themes/default/locolor/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/locolor/Makefile" ;; + "ksplashml/pics/themes/none/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/none/Makefile" ;; + "ksplashml/pics/themes/simple/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/simple/Makefile" ;; + "ksplashml/themeengine/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/Makefile" ;; + "ksplashml/themeengine/default/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/default/Makefile" ;; + "ksplashml/themeengine/redmond/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/Makefile" ;; + "ksplashml/themeengine/redmond/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/pics/Makefile" ;; + "ksplashml/themeengine/simple/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/simple/Makefile" ;; + "ksplashml/themeengine/standard/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/Makefile" ;; + "ksplashml/themeengine/standard/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/pics/Makefile" ;; + "kstart/Makefile") CONFIG_FILES="$CONFIG_FILES kstart/Makefile" ;; + "ksysguard/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/Makefile" ;; + "ksysguard/CContLib/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/CContLib/Makefile" ;; + "ksysguard/example/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/example/Makefile" ;; + "ksysguard/gui/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/gui/Makefile" ;; + "ksysguard/gui/SensorDisplayLib/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/gui/SensorDisplayLib/Makefile" ;; + "ksysguard/gui/ksgrd/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/gui/ksgrd/Makefile" ;; + "ksysguard/ksysguardd/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Makefile" ;; + "ksysguard/ksysguardd/FreeBSD/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/FreeBSD/Makefile" ;; + "ksysguard/ksysguardd/Irix/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Irix/Makefile" ;; + "ksysguard/ksysguardd/Linux/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Linux/Makefile" ;; + "ksysguard/ksysguardd/NetBSD/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/NetBSD/Makefile" ;; + "ksysguard/ksysguardd/OpenBSD/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/OpenBSD/Makefile" ;; + "ksysguard/ksysguardd/Solaris/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Solaris/Makefile" ;; + "ksysguard/ksysguardd/Tru64/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Tru64/Makefile" ;; + "ksysguard/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/pics/Makefile" ;; + "ksystraycmd/Makefile") CONFIG_FILES="$CONFIG_FILES ksystraycmd/Makefile" ;; + "ktip/Makefile") CONFIG_FILES="$CONFIG_FILES ktip/Makefile" ;; + "ktip/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ktip/pics/Makefile" ;; + "kwin/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/Makefile" ;; + "kwin/clients/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/Makefile" ;; + "kwin/clients/b2/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/Makefile" ;; + "kwin/clients/b2/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/config/Makefile" ;; + "kwin/clients/default/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/default/Makefile" ;; + "kwin/clients/default/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/default/config/Makefile" ;; + "kwin/clients/keramik/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/Makefile" ;; + "kwin/clients/keramik/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/config/Makefile" ;; + "kwin/clients/kwmtheme/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/Makefile" ;; + "kwin/clients/kwmtheme/cli_installer/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/cli_installer/Makefile" ;; + "kwin/clients/laptop/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/laptop/Makefile" ;; + "kwin/clients/modernsystem/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/Makefile" ;; + "kwin/clients/modernsystem/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/config/Makefile" ;; + "kwin/clients/plastik/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/Makefile" ;; + "kwin/clients/plastik/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/config/Makefile" ;; + "kwin/clients/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/Makefile" ;; + "kwin/clients/quartz/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/config/Makefile" ;; + "kwin/clients/redmond/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/redmond/Makefile" ;; + "kwin/clients/test/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/test/Makefile" ;; + "kwin/clients/web/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/web/Makefile" ;; + "kwin/data/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/data/Makefile" ;; + "kwin/kcmkwin/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/Makefile" ;; + "kwin/kcmkwin/kwindecoration/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwindecoration/Makefile" ;; + "kwin/kcmkwin/kwinoptions/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinoptions/Makefile" ;; + "kwin/kcmkwin/kwinrules/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinrules/Makefile" ;; + "kwin/killer/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/killer/Makefile" ;; + "kwin/kompmgr/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kompmgr/Makefile" ;; + "kwin/lib/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/lib/Makefile" ;; + "kwin/oldheaders/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/oldheaders/Makefile" ;; + "kwin/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/pics/Makefile" ;; + "kwin/tools/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/tools/Makefile" ;; + "kwin/tools/decobenchmark/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/tools/decobenchmark/Makefile" ;; + "kxkb/Makefile") CONFIG_FILES="$CONFIG_FILES kxkb/Makefile" ;; + "kxkb/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kxkb/pics/Makefile" ;; + "l10n/Makefile") CONFIG_FILES="$CONFIG_FILES l10n/Makefile" ;; + "libkonq/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/Makefile" ;; + "libkonq/favicons/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/favicons/Makefile" ;; + "libkonq/pics/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/pics/Makefile" ;; + "libkonq/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/tests/Makefile" ;; + "nsplugins/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/Makefile" ;; + "nsplugins/test/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/test/Makefile" ;; + "nsplugins/viewer/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/viewer/Makefile" ;; + "nsplugins/wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/wrapper/Makefile" ;; + "pics/Makefile") CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;; + "pics/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;; + "pics/wallpapers/Makefile") CONFIG_FILES="$CONFIG_FILES pics/wallpapers/Makefile" ;; + "kdm/kfrontend/sessions/kde.desktop") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/kde.desktop" ;; + "khelpcenter/searchhandlers/khc_docbookdig.pl") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_docbookdig.pl" ;; + "khelpcenter/searchhandlers/khc_htdig.pl") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_htdig.pl" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -58701,739 +58191,1013 @@ fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@target@,$target,;t t -s,@target_cpu@,$target_cpu,;t t -s,@target_vendor@,$target_vendor,;t t -s,@target_os@,$target_os,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@KDECONFIG@,$KDECONFIG,;t t -s,@kde_libs_prefix@,$kde_libs_prefix,;t t -s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t -s,@CONF_FILES@,$CONF_FILES,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t -s,@HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t -s,@unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t -s,@unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t -s,@USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t -s,@USE_RTTI@,$USE_RTTI,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t -s,@NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t -s,@ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t -s,@LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t -s,@LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t -s,@KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t -s,@KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t -s,@KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t -s,@KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t -s,@KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t -s,@KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t -s,@KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@KDE_PLUGIN@,$KDE_PLUGIN,;t t -s,@KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t -s,@MSGFMT@,$MSGFMT,;t t -s,@GMSGFMT@,$GMSGFMT,;t t -s,@XGETTEXT@,$XGETTEXT,;t t -s,@LIBUTIL@,$LIBUTIL,;t t -s,@LIBCOMPAT@,$LIBCOMPAT,;t t -s,@LIBCRYPT@,$LIBCRYPT,;t t -s,@LIBRESOLV@,$LIBRESOLV,;t t -s,@LIB_POLL@,$LIB_POLL,;t t -s,@FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t -s,@LIBSOCKET@,$LIBSOCKET,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@LIBUCB@,$LIBUCB,;t t -s,@LIBDL@,$LIBDL,;t t -s,@KDE_USE_FPIE@,$KDE_USE_FPIE,;t t -s,@KDE_USE_PIE@,$KDE_USE_PIE,;t t -s,@include_x11_TRUE@,$include_x11_TRUE,;t t -s,@include_x11_FALSE@,$include_x11_FALSE,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@LIB_X11@,$LIB_X11,;t t -s,@LIB_XRENDER@,$LIB_XRENDER,;t t -s,@LIBSM@,$LIBSM,;t t -s,@X_INCLUDES@,$X_INCLUDES,;t t -s,@X_LDFLAGS@,$X_LDFLAGS,;t t -s,@x_includes@,$x_includes,;t t -s,@x_libraries@,$x_libraries,;t t -s,@QTE_NORTTI@,$QTE_NORTTI,;t t -s,@LIB_XEXT@,$LIB_XEXT,;t t -s,@LIBPTHREAD@,$LIBPTHREAD,;t t -s,@USE_THREADS@,$USE_THREADS,;t t -s,@KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t -s,@KDE_MT_LIBS@,$KDE_MT_LIBS,;t t -s,@USER_INCLUDES@,$USER_INCLUDES,;t t -s,@USER_LDFLAGS@,$USER_LDFLAGS,;t t -s,@LIBZ@,$LIBZ,;t t -s,@LIBPNG@,$LIBPNG,;t t -s,@LIBJPEG@,$LIBJPEG,;t t -s,@qt_libraries@,$qt_libraries,;t t -s,@qt_includes@,$qt_includes,;t t -s,@QT_INCLUDES@,$QT_INCLUDES,;t t -s,@QT_LDFLAGS@,$QT_LDFLAGS,;t t -s,@PERL@,$PERL,;t t -s,@MOC@,$MOC,;t t -s,@UIC@,$UIC,;t t -s,@UIC_TR@,$UIC_TR,;t t -s,@LIB_QT@,$LIB_QT,;t t -s,@LIB_QPE@,$LIB_QPE,;t t -s,@kde_qtver@,$kde_qtver,;t t -s,@KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t -s,@KDE_RPATH@,$KDE_RPATH,;t t -s,@X_RPATH@,$X_RPATH,;t t -s,@kde_libraries@,$kde_libraries,;t t -s,@kde_includes@,$kde_includes,;t t -s,@KDE_LDFLAGS@,$KDE_LDFLAGS,;t t -s,@KDE_INCLUDES@,$KDE_INCLUDES,;t t -s,@all_includes@,$all_includes,;t t -s,@all_libraries@,$all_libraries,;t t -s,@AUTODIRS@,$AUTODIRS,;t t -s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t -s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t -s,@MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t -s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t -s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t -s,@DCOPIDLNG@,$DCOPIDLNG,;t t -s,@DCOPIDL@,$DCOPIDL,;t t -s,@DCOPIDL2CPP@,$DCOPIDL2CPP,;t t -s,@DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t -s,@MCOPIDL@,$MCOPIDL,;t t -s,@ARTSCCONFIG@,$ARTSCCONFIG,;t t -s,@MEINPROC@,$MEINPROC,;t t -s,@KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t -s,@XMLLINT@,$XMLLINT,;t t -s,@kde_htmldir@,$kde_htmldir,;t t -s,@kde_appsdir@,$kde_appsdir,;t t -s,@kde_icondir@,$kde_icondir,;t t -s,@kde_sounddir@,$kde_sounddir,;t t -s,@kde_datadir@,$kde_datadir,;t t -s,@kde_locale@,$kde_locale,;t t -s,@kde_confdir@,$kde_confdir,;t t -s,@kde_kcfgdir@,$kde_kcfgdir,;t t -s,@kde_mimedir@,$kde_mimedir,;t t -s,@kde_wallpaperdir@,$kde_wallpaperdir,;t t -s,@kde_bindir@,$kde_bindir,;t t -s,@xdg_appsdir@,$xdg_appsdir,;t t -s,@xdg_menudir@,$xdg_menudir,;t t -s,@xdg_directorydir@,$xdg_directorydir,;t t -s,@kde_templatesdir@,$kde_templatesdir,;t t -s,@kde_servicesdir@,$kde_servicesdir,;t t -s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t -s,@kde_moduledir@,$kde_moduledir,;t t -s,@kdeinitdir@,$kdeinitdir,;t t -s,@kde_styledir@,$kde_styledir,;t t -s,@kde_widgetdir@,$kde_widgetdir,;t t -s,@LIB_KDED@,$LIB_KDED,;t t -s,@LIB_KDECORE@,$LIB_KDECORE,;t t -s,@LIB_KDEUI@,$LIB_KDEUI,;t t -s,@LIB_KIO@,$LIB_KIO,;t t -s,@LIB_KJS@,$LIB_KJS,;t t -s,@LIB_SMB@,$LIB_SMB,;t t -s,@LIB_KAB@,$LIB_KAB,;t t -s,@LIB_KABC@,$LIB_KABC,;t t -s,@LIB_KHTML@,$LIB_KHTML,;t t -s,@LIB_KSPELL@,$LIB_KSPELL,;t t -s,@LIB_KPARTS@,$LIB_KPARTS,;t t -s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t -s,@LIB_KUTILS@,$LIB_KUTILS,;t t -s,@LIB_KDEPIM@,$LIB_KDEPIM,;t t -s,@LIB_KIMPROXY@,$LIB_KIMPROXY,;t t -s,@LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t -s,@LIB_KDNSSD@,$LIB_KDNSSD,;t t -s,@LIB_KUNITTEST@,$LIB_KUNITTEST,;t t -s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t -s,@LIB_KFILE@,$LIB_KFILE,;t t -s,@LIB_KFM@,$LIB_KFM,;t t -s,@PAMLIBS@,$PAMLIBS,;t t -s,@LIBSHADOW@,$LIBSHADOW,;t t -s,@LIBGEN@,$LIBGEN,;t t -s,@SETUIDFLAGS@,$SETUIDFLAGS,;t t -s,@PASSWDLIBS@,$PASSWDLIBS,;t t -s,@KDM_PAM_SERVICE@,$KDM_PAM_SERVICE,;t t -s,@KCHECKPASS_PAM_SERVICE@,$KCHECKPASS_PAM_SERVICE,;t t -s,@KSCREENSAVER_PAM_SERVICE@,$KSCREENSAVER_PAM_SERVICE,;t t -s,@LIBALIB@,$LIBALIB,;t t -s,@LIBRPC@,$LIBRPC,;t t -s,@LIBOSSAUDIO@,$LIBOSSAUDIO,;t t -s,@LIBCFG@,$LIBCFG,;t t -s,@LIBODM@,$LIBODM,;t t -s,@LIBCURSES@,$LIBCURSES,;t t -s,@LIBKSTAT@,$LIBKSTAT,;t t -s,@LIBDEVINFO@,$LIBDEVINFO,;t t -s,@JAVAC@,$JAVAC,;t t -s,@JAVAH@,$JAVAH,;t t -s,@JAR@,$JAR,;t t -s,@JVMLIBS@,$JVMLIBS,;t t -s,@jni_includes@,$jni_includes,;t t -s,@MD5SUM@,$MD5SUM,;t t -s,@MD5SUM_CUT@,$MD5SUM_CUT,;t t -s,@XTESTLIB@,$XTESTLIB,;t t -s,@LIB_XCURSOR@,$LIB_XCURSOR,;t t -s,@have_xcursor_TRUE@,$have_xcursor_TRUE,;t t -s,@have_xcursor_FALSE@,$have_xcursor_FALSE,;t t -s,@QTDOCDIR@,$QTDOCDIR,;t t -s,@KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t -s,@DOXYGEN@,$DOXYGEN,;t t -s,@DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t -s,@DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t -s,@KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t -s,@KDE_BINDIR@,$KDE_BINDIR,;t t -s,@LIBART_LIBS@,$LIBART_LIBS,;t t -s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t -s,@LIBART_RPATH@,$LIBART_RPATH,;t t -s,@RUN_KAPPFINDER@,$RUN_KAPPFINDER,;t t -s,@include_kcontrol_access_TRUE@,$include_kcontrol_access_TRUE,;t t -s,@include_kcontrol_access_FALSE@,$include_kcontrol_access_FALSE,;t t -s,@include_kcontrol_accessibility_TRUE@,$include_kcontrol_accessibility_TRUE,;t t -s,@include_kcontrol_accessibility_FALSE@,$include_kcontrol_accessibility_FALSE,;t t -s,@SSL_INCLUDES@,$SSL_INCLUDES,;t t -s,@SSL_LDFLAGS@,$SSL_LDFLAGS,;t t -s,@LIBSSL@,$LIBSSL,;t t -s,@DPMSINC@,$DPMSINC,;t t -s,@DPMSLIB@,$DPMSLIB,;t t -s,@LIBFONTCONFIG_LIBS@,$LIBFONTCONFIG_LIBS,;t t -s,@LIBFONTCONFIG_CFLAGS@,$LIBFONTCONFIG_CFLAGS,;t t -s,@LIBFONTCONFIG_RPATH@,$LIBFONTCONFIG_RPATH,;t t -s,@LIB_TRU64_MACH@,$LIB_TRU64_MACH,;t t -s,@GLINC@,$GLINC,;t t -s,@GLLIB@,$GLLIB,;t t -s,@COMPILE_GL_INFO_TRUE@,$COMPILE_GL_INFO_TRUE,;t t -s,@COMPILE_GL_INFO_FALSE@,$COMPILE_GL_INFO_FALSE,;t t -s,@LIBUSBCONFIG@,$LIBUSBCONFIG,;t t -s,@USB_LIBS@,$USB_LIBS,;t t -s,@USB_CFLAGS@,$USB_CFLAGS,;t t -s,@include_kcontrol_joystick_TRUE@,$include_kcontrol_joystick_TRUE,;t t -s,@include_kcontrol_joystick_FALSE@,$include_kcontrol_joystick_FALSE,;t t -s,@LIBFREETYPE_LIBS@,$LIBFREETYPE_LIBS,;t t -s,@LIBFREETYPE_CFLAGS@,$LIBFREETYPE_CFLAGS,;t t -s,@LIBFREETYPE_RPATH@,$LIBFREETYPE_RPATH,;t t -s,@UNAME@,$UNAME,;t t -s,@LIB_FONT_ENC@,$LIB_FONT_ENC,;t t -s,@LIBXFT_LIB@,$LIBXFT_LIB,;t t -s,@include_fontinst_tn_TRUE@,$include_fontinst_tn_TRUE,;t t -s,@include_fontinst_tn_FALSE@,$include_fontinst_tn_FALSE,;t t -s,@include_kcontrol_kfontinst_TRUE@,$include_kcontrol_kfontinst_TRUE,;t t -s,@include_kcontrol_kfontinst_FALSE@,$include_kcontrol_kfontinst_FALSE,;t t -s,@LIB_XRANDR@,$LIB_XRANDR,;t t -s,@include_kcontrol_randr_TRUE@,$include_kcontrol_randr_TRUE,;t t -s,@include_kcontrol_randr_FALSE@,$include_kcontrol_randr_FALSE,;t t -s,@include_kcontrol_smartcard_TRUE@,$include_kcontrol_smartcard_TRUE,;t t -s,@include_kcontrol_smartcard_FALSE@,$include_kcontrol_smartcard_FALSE,;t t -s,@include_kcontrol_usbview_TRUE@,$include_kcontrol_usbview_TRUE,;t t -s,@include_kcontrol_usbview_FALSE@,$include_kcontrol_usbview_FALSE,;t t -s,@install_usbids_TRUE@,$install_usbids_TRUE,;t t -s,@install_usbids_FALSE@,$install_usbids_FALSE,;t t -s,@include_kcontrol_view1394_TRUE@,$include_kcontrol_view1394_TRUE,;t t -s,@include_kcontrol_view1394_FALSE@,$include_kcontrol_view1394_FALSE,;t t -s,@LIB_XSS@,$LIB_XSS,;t t -s,@LIB_XF86MISC@,$LIB_XF86MISC,;t t -s,@nogroup@,$nogroup,;t t -s,@LIBXDMCP@,$LIBXDMCP,;t t -s,@KRB4_INCS@,$KRB4_INCS,;t t -s,@KRB4_LIBS@,$KRB4_LIBS,;t t -s,@KRB4_RPATH@,$KRB4_RPATH,;t t -s,@LIB_LIBS@,$LIB_LIBS,;t t -s,@LIBPOSIX4@,$LIBPOSIX4,;t t -s,@KRB5_INCS@,$KRB5_INCS,;t t -s,@KRB5_LIBS@,$KRB5_LIBS,;t t -s,@KRB5_RPATH@,$KRB5_RPATH,;t t -s,@LIB_ARTS@,$LIB_ARTS,;t t -s,@ARTS_CFLAGS@,$ARTS_CFLAGS,;t t -s,@KHOTKEYS_ARTS_SUBDIR@,$KHOTKEYS_ARTS_SUBDIR,;t t -s,@LIB_KVM@,$LIB_KVM,;t t -s,@LIB_XCOMPOSITE@,$LIB_XCOMPOSITE,;t t -s,@LIB_XFIXES@,$LIB_XFIXES,;t t -s,@SASL2_LIBS@,$SASL2_LIBS,;t t -s,@LIBBZ2@,$LIBBZ2,;t t -s,@include_BZIP2_TRUE@,$include_BZIP2_TRUE,;t t -s,@include_BZIP2_FALSE@,$include_BZIP2_FALSE,;t t -s,@LIB_LBER@,$LIB_LBER,;t t -s,@LDAP_INCS@,$LDAP_INCS,;t t -s,@LDAP_LIBS@,$LDAP_LIBS,;t t -s,@LDAP_RPATH@,$LDAP_RPATH,;t t -s,@include_kioslave_ldap_TRUE@,$include_kioslave_ldap_TRUE,;t t -s,@include_kioslave_ldap_FALSE@,$include_kioslave_ldap_FALSE,;t t -s,@LINUXCDPOLLING@,$LINUXCDPOLLING,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@HAL_CFLAGS@,$HAL_CFLAGS,;t t -s,@HAL_LIBS@,$HAL_LIBS,;t t -s,@HAL_INCS@,$HAL_INCS,;t t -s,@DBUS_CFLAGS@,$DBUS_CFLAGS,;t t -s,@DBUS_LIBS@,$DBUS_LIBS,;t t -s,@DBUS_INCS@,$DBUS_INCS,;t t -s,@DBUSQT_INCS@,$DBUSQT_INCS,;t t -s,@DBUSQT_LIBS@,$DBUSQT_LIBS,;t t -s,@HALBACKEND@,$HALBACKEND,;t t -s,@include_media_linuxcdpolling_TRUE@,$include_media_linuxcdpolling_TRUE,;t t -s,@include_media_linuxcdpolling_FALSE@,$include_media_linuxcdpolling_FALSE,;t t -s,@include_media_halbackend_TRUE@,$include_media_halbackend_TRUE,;t t -s,@include_media_halbackend_FALSE@,$include_media_halbackend_FALSE,;t t -s,@SMBCLIENT_EXTRA_LIBS@,$SMBCLIENT_EXTRA_LIBS,;t t -s,@include_kioslave_smb_TRUE@,$include_kioslave_smb_TRUE,;t t -s,@include_kioslave_smb_FALSE@,$include_kioslave_smb_FALSE,;t t -s,@LIB_EXR@,$LIB_EXR,;t t -s,@EXR_FLAGS@,$EXR_FLAGS,;t t -s,@include_EXR_MODULES_TRUE@,$include_EXR_MODULES_TRUE,;t t -s,@include_EXR_MODULES_FALSE@,$include_EXR_MODULES_FALSE,;t t -s,@LIBMALLOC@,$LIBMALLOC,;t t -s,@LIB_XINERAMA@,$LIB_XINERAMA,;t t -s,@include_ksysguardd_TRUE@,$include_ksysguardd_TRUE,;t t -s,@include_ksysguardd_FALSE@,$include_ksysguardd_FALSE,;t t -s,@include_ksysguardd_linux_TRUE@,$include_ksysguardd_linux_TRUE,;t t -s,@include_ksysguardd_linux_FALSE@,$include_ksysguardd_linux_FALSE,;t t -s,@include_ksysguardd_freebsd_TRUE@,$include_ksysguardd_freebsd_TRUE,;t t -s,@include_ksysguardd_freebsd_FALSE@,$include_ksysguardd_freebsd_FALSE,;t t -s,@include_ksysguardd_netbsd_TRUE@,$include_ksysguardd_netbsd_TRUE,;t t -s,@include_ksysguardd_netbsd_FALSE@,$include_ksysguardd_netbsd_FALSE,;t t -s,@include_ksysguardd_solaris_TRUE@,$include_ksysguardd_solaris_TRUE,;t t -s,@include_ksysguardd_solaris_FALSE@,$include_ksysguardd_solaris_FALSE,;t t -s,@include_ksysguardd_tru64_TRUE@,$include_ksysguardd_tru64_TRUE,;t t -s,@include_ksysguardd_tru64_FALSE@,$include_ksysguardd_tru64_FALSE,;t t -s,@include_ksysguardd_irix_TRUE@,$include_ksysguardd_irix_TRUE,;t t -s,@include_ksysguardd_irix_FALSE@,$include_ksysguardd_irix_FALSE,;t t -s,@include_ksysguardd_openbsd_TRUE@,$include_ksysguardd_openbsd_TRUE,;t t -s,@include_ksysguardd_openbsd_FALSE@,$include_ksysguardd_openbsd_FALSE,;t t -s,@LIBHOSTS@,$LIBHOSTS,;t t -s,@LIBSENSORS@,$LIBSENSORS,;t t -s,@supports_i8k_TRUE@,$supports_i8k_TRUE,;t t -s,@supports_i8k_FALSE@,$supports_i8k_FALSE,;t t -s,@LIB_DNSSD@,$LIB_DNSSD,;t t -s,@HAVE_DNSSD_TRUE@,$HAVE_DNSSD_TRUE,;t t -s,@HAVE_DNSSD_FALSE@,$HAVE_DNSSD_FALSE,;t t -s,@include_kompmgr_TRUE@,$include_kompmgr_TRUE,;t t -s,@include_kompmgr_FALSE@,$include_kompmgr_FALSE,;t t -s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t -s,@libkonq_SUBDIR_included_TRUE@,$libkonq_SUBDIR_included_TRUE,;t t -s,@libkonq_SUBDIR_included_FALSE@,$libkonq_SUBDIR_included_FALSE,;t t -s,@applnk_SUBDIR_included_TRUE@,$applnk_SUBDIR_included_TRUE,;t t -s,@applnk_SUBDIR_included_FALSE@,$applnk_SUBDIR_included_FALSE,;t t -s,@doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t -s,@doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t -s,@drkonqi_SUBDIR_included_TRUE@,$drkonqi_SUBDIR_included_TRUE,;t t -s,@drkonqi_SUBDIR_included_FALSE@,$drkonqi_SUBDIR_included_FALSE,;t t -s,@kappfinder_SUBDIR_included_TRUE@,$kappfinder_SUBDIR_included_TRUE,;t t -s,@kappfinder_SUBDIR_included_FALSE@,$kappfinder_SUBDIR_included_FALSE,;t t -s,@kate_SUBDIR_included_TRUE@,$kate_SUBDIR_included_TRUE,;t t -s,@kate_SUBDIR_included_FALSE@,$kate_SUBDIR_included_FALSE,;t t -s,@kcheckpass_SUBDIR_included_TRUE@,$kcheckpass_SUBDIR_included_TRUE,;t t -s,@kcheckpass_SUBDIR_included_FALSE@,$kcheckpass_SUBDIR_included_FALSE,;t t -s,@kcminit_SUBDIR_included_TRUE@,$kcminit_SUBDIR_included_TRUE,;t t -s,@kcminit_SUBDIR_included_FALSE@,$kcminit_SUBDIR_included_FALSE,;t t -s,@kdcop_SUBDIR_included_TRUE@,$kdcop_SUBDIR_included_TRUE,;t t -s,@kdcop_SUBDIR_included_FALSE@,$kdcop_SUBDIR_included_FALSE,;t t -s,@kdebugdialog_SUBDIR_included_TRUE@,$kdebugdialog_SUBDIR_included_TRUE,;t t -s,@kdebugdialog_SUBDIR_included_FALSE@,$kdebugdialog_SUBDIR_included_FALSE,;t t -s,@kdeeject_SUBDIR_included_TRUE@,$kdeeject_SUBDIR_included_TRUE,;t t -s,@kdeeject_SUBDIR_included_FALSE@,$kdeeject_SUBDIR_included_FALSE,;t t -s,@kdepasswd_SUBDIR_included_TRUE@,$kdepasswd_SUBDIR_included_TRUE,;t t -s,@kdepasswd_SUBDIR_included_FALSE@,$kdepasswd_SUBDIR_included_FALSE,;t t -s,@kdeprint_SUBDIR_included_TRUE@,$kdeprint_SUBDIR_included_TRUE,;t t -s,@kdeprint_SUBDIR_included_FALSE@,$kdeprint_SUBDIR_included_FALSE,;t t -s,@kdesu_SUBDIR_included_TRUE@,$kdesu_SUBDIR_included_TRUE,;t t -s,@kdesu_SUBDIR_included_FALSE@,$kdesu_SUBDIR_included_FALSE,;t t -s,@kdialog_SUBDIR_included_TRUE@,$kdialog_SUBDIR_included_TRUE,;t t -s,@kdialog_SUBDIR_included_FALSE@,$kdialog_SUBDIR_included_FALSE,;t t -s,@kdmlib_SUBDIR_included_TRUE@,$kdmlib_SUBDIR_included_TRUE,;t t -s,@kdmlib_SUBDIR_included_FALSE@,$kdmlib_SUBDIR_included_FALSE,;t t -s,@kfind_SUBDIR_included_TRUE@,$kfind_SUBDIR_included_TRUE,;t t -s,@kfind_SUBDIR_included_FALSE@,$kfind_SUBDIR_included_FALSE,;t t -s,@khelpcenter_SUBDIR_included_TRUE@,$khelpcenter_SUBDIR_included_TRUE,;t t -s,@khelpcenter_SUBDIR_included_FALSE@,$khelpcenter_SUBDIR_included_FALSE,;t t -s,@khotkeys_SUBDIR_included_TRUE@,$khotkeys_SUBDIR_included_TRUE,;t t -s,@khotkeys_SUBDIR_included_FALSE@,$khotkeys_SUBDIR_included_FALSE,;t t -s,@kioslave_SUBDIR_included_TRUE@,$kioslave_SUBDIR_included_TRUE,;t t -s,@kioslave_SUBDIR_included_FALSE@,$kioslave_SUBDIR_included_FALSE,;t t -s,@klipper_SUBDIR_included_TRUE@,$klipper_SUBDIR_included_TRUE,;t t -s,@klipper_SUBDIR_included_FALSE@,$klipper_SUBDIR_included_FALSE,;t t -s,@kmenuedit_SUBDIR_included_TRUE@,$kmenuedit_SUBDIR_included_TRUE,;t t -s,@kmenuedit_SUBDIR_included_FALSE@,$kmenuedit_SUBDIR_included_FALSE,;t t -s,@knetattach_SUBDIR_included_TRUE@,$knetattach_SUBDIR_included_TRUE,;t t -s,@knetattach_SUBDIR_included_FALSE@,$knetattach_SUBDIR_included_FALSE,;t t -s,@konsole_SUBDIR_included_TRUE@,$konsole_SUBDIR_included_TRUE,;t t -s,@konsole_SUBDIR_included_FALSE@,$konsole_SUBDIR_included_FALSE,;t t -s,@kpager_SUBDIR_included_TRUE@,$kpager_SUBDIR_included_TRUE,;t t -s,@kpager_SUBDIR_included_FALSE@,$kpager_SUBDIR_included_FALSE,;t t -s,@kpersonalizer_SUBDIR_included_TRUE@,$kpersonalizer_SUBDIR_included_TRUE,;t t -s,@kpersonalizer_SUBDIR_included_FALSE@,$kpersonalizer_SUBDIR_included_FALSE,;t t -s,@kreadconfig_SUBDIR_included_TRUE@,$kreadconfig_SUBDIR_included_TRUE,;t t -s,@kreadconfig_SUBDIR_included_FALSE@,$kreadconfig_SUBDIR_included_FALSE,;t t -s,@kscreensaver_SUBDIR_included_TRUE@,$kscreensaver_SUBDIR_included_TRUE,;t t -s,@kscreensaver_SUBDIR_included_FALSE@,$kscreensaver_SUBDIR_included_FALSE,;t t -s,@ksplashml_SUBDIR_included_TRUE@,$ksplashml_SUBDIR_included_TRUE,;t t -s,@ksplashml_SUBDIR_included_FALSE@,$ksplashml_SUBDIR_included_FALSE,;t t -s,@kstart_SUBDIR_included_TRUE@,$kstart_SUBDIR_included_TRUE,;t t -s,@kstart_SUBDIR_included_FALSE@,$kstart_SUBDIR_included_FALSE,;t t -s,@ksysguard_SUBDIR_included_TRUE@,$ksysguard_SUBDIR_included_TRUE,;t t -s,@ksysguard_SUBDIR_included_FALSE@,$ksysguard_SUBDIR_included_FALSE,;t t -s,@ksystraycmd_SUBDIR_included_TRUE@,$ksystraycmd_SUBDIR_included_TRUE,;t t -s,@ksystraycmd_SUBDIR_included_FALSE@,$ksystraycmd_SUBDIR_included_FALSE,;t t -s,@ktip_SUBDIR_included_TRUE@,$ktip_SUBDIR_included_TRUE,;t t -s,@ktip_SUBDIR_included_FALSE@,$ktip_SUBDIR_included_FALSE,;t t -s,@kwin_SUBDIR_included_TRUE@,$kwin_SUBDIR_included_TRUE,;t t -s,@kwin_SUBDIR_included_FALSE@,$kwin_SUBDIR_included_FALSE,;t t -s,@kxkb_SUBDIR_included_TRUE@,$kxkb_SUBDIR_included_TRUE,;t t -s,@kxkb_SUBDIR_included_FALSE@,$kxkb_SUBDIR_included_FALSE,;t t -s,@l10n_SUBDIR_included_TRUE@,$l10n_SUBDIR_included_TRUE,;t t -s,@l10n_SUBDIR_included_FALSE@,$l10n_SUBDIR_included_FALSE,;t t -s,@nsplugins_SUBDIR_included_TRUE@,$nsplugins_SUBDIR_included_TRUE,;t t -s,@nsplugins_SUBDIR_included_FALSE@,$nsplugins_SUBDIR_included_FALSE,;t t -s,@pics_SUBDIR_included_TRUE@,$pics_SUBDIR_included_TRUE,;t t -s,@pics_SUBDIR_included_FALSE@,$pics_SUBDIR_included_FALSE,;t t -s,@konqueror_SUBDIR_included_TRUE@,$konqueror_SUBDIR_included_TRUE,;t t -s,@konqueror_SUBDIR_included_FALSE@,$konqueror_SUBDIR_included_FALSE,;t t -s,@ksmserver_SUBDIR_included_TRUE@,$ksmserver_SUBDIR_included_TRUE,;t t -s,@ksmserver_SUBDIR_included_FALSE@,$ksmserver_SUBDIR_included_FALSE,;t t -s,@kicker_SUBDIR_included_TRUE@,$kicker_SUBDIR_included_TRUE,;t t -s,@kicker_SUBDIR_included_FALSE@,$kicker_SUBDIR_included_FALSE,;t t -s,@kcontrol_SUBDIR_included_TRUE@,$kcontrol_SUBDIR_included_TRUE,;t t -s,@kcontrol_SUBDIR_included_FALSE@,$kcontrol_SUBDIR_included_FALSE,;t t -s,@kdesktop_SUBDIR_included_TRUE@,$kdesktop_SUBDIR_included_TRUE,;t t -s,@kdesktop_SUBDIR_included_FALSE@,$kdesktop_SUBDIR_included_FALSE,;t t -s,@kdm_SUBDIR_included_TRUE@,$kdm_SUBDIR_included_TRUE,;t t -s,@kdm_SUBDIR_included_FALSE@,$kdm_SUBDIR_included_FALSE,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +target!$target$ac_delim +target_cpu!$target_cpu$ac_delim +target_vendor!$target_vendor$ac_delim +target_os!$target_os$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim +KDECONFIG!$KDECONFIG$ac_delim +kde_libs_prefix!$kde_libs_prefix$ac_delim +kde_libs_htmldir!$kde_libs_htmldir$ac_delim +CONF_FILES!$CONF_FILES$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +CPP!$CPP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim +HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim +unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim +unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim +USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim +USE_RTTI!$USE_RTTI$ac_delim +CXXCPP!$CXXCPP$ac_delim +NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim +NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim +ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim +LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim +LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim +KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim +KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim +KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim +KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim +KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim +KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim +KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +KDE_PLUGIN!$KDE_PLUGIN$ac_delim +KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim +MSGFMT!$MSGFMT$ac_delim +GMSGFMT!$GMSGFMT$ac_delim +XGETTEXT!$XGETTEXT$ac_delim +LIBUTIL!$LIBUTIL$ac_delim +LIBCOMPAT!$LIBCOMPAT$ac_delim +LIBCRYPT!$LIBCRYPT$ac_delim +LIBRESOLV!$LIBRESOLV$ac_delim +LIB_POLL!$LIB_POLL$ac_delim +FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim +LIBSOCKET!$LIBSOCKET$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +LIBUCB!$LIBUCB$ac_delim +LIBDL!$LIBDL$ac_delim +KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim +KDE_USE_PIE!$KDE_USE_PIE$ac_delim +include_x11_TRUE!$include_x11_TRUE$ac_delim +include_x11_FALSE!$include_x11_FALSE$ac_delim +XMKMF!$XMKMF$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +LIB_X11!$LIB_X11$ac_delim +LIB_XRENDER!$LIB_XRENDER$ac_delim +LIBSM!$LIBSM$ac_delim +X_INCLUDES!$X_INCLUDES$ac_delim +X_LDFLAGS!$X_LDFLAGS$ac_delim +x_includes!$x_includes$ac_delim +x_libraries!$x_libraries$ac_delim +QTE_NORTTI!$QTE_NORTTI$ac_delim +LIB_XEXT!$LIB_XEXT$ac_delim +LIBPTHREAD!$LIBPTHREAD$ac_delim +USE_THREADS!$USE_THREADS$ac_delim +KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim +KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim +USER_INCLUDES!$USER_INCLUDES$ac_delim +USER_LDFLAGS!$USER_LDFLAGS$ac_delim +LIBZ!$LIBZ$ac_delim +LIBPNG!$LIBPNG$ac_delim +LIBJPEG!$LIBJPEG$ac_delim +qt_libraries!$qt_libraries$ac_delim +qt_includes!$qt_includes$ac_delim +QT_INCLUDES!$QT_INCLUDES$ac_delim +QT_LDFLAGS!$QT_LDFLAGS$ac_delim +PERL!$PERL$ac_delim +MOC!$MOC$ac_delim +UIC!$UIC$ac_delim +UIC_TR!$UIC_TR$ac_delim +LIB_QT!$LIB_QT$ac_delim +LIB_QPE!$LIB_QPE$ac_delim +kde_qtver!$kde_qtver$ac_delim +KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim +KDE_RPATH!$KDE_RPATH$ac_delim +X_RPATH!$X_RPATH$ac_delim +kde_libraries!$kde_libraries$ac_delim +kde_includes!$kde_includes$ac_delim +KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim +KDE_INCLUDES!$KDE_INCLUDES$ac_delim +all_includes!$all_includes$ac_delim +all_libraries!$all_libraries$ac_delim +AUTODIRS!$AUTODIRS$ac_delim +include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim +include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim +MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim +KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim +KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +DCOPIDLNG!$DCOPIDLNG$ac_delim +DCOPIDL!$DCOPIDL$ac_delim +DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim +DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim +MCOPIDL!$MCOPIDL$ac_delim +ARTSCCONFIG!$ARTSCCONFIG$ac_delim +MEINPROC!$MEINPROC$ac_delim +KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim +XMLLINT!$XMLLINT$ac_delim +kde_htmldir!$kde_htmldir$ac_delim +kde_appsdir!$kde_appsdir$ac_delim +kde_icondir!$kde_icondir$ac_delim +kde_sounddir!$kde_sounddir$ac_delim +kde_datadir!$kde_datadir$ac_delim +kde_locale!$kde_locale$ac_delim +kde_confdir!$kde_confdir$ac_delim +kde_kcfgdir!$kde_kcfgdir$ac_delim +kde_mimedir!$kde_mimedir$ac_delim +kde_wallpaperdir!$kde_wallpaperdir$ac_delim +kde_bindir!$kde_bindir$ac_delim +xdg_appsdir!$xdg_appsdir$ac_delim +xdg_menudir!$xdg_menudir$ac_delim +xdg_directorydir!$xdg_directorydir$ac_delim +kde_templatesdir!$kde_templatesdir$ac_delim +kde_servicesdir!$kde_servicesdir$ac_delim +kde_servicetypesdir!$kde_servicetypesdir$ac_delim +kde_moduledir!$kde_moduledir$ac_delim +kdeinitdir!$kdeinitdir$ac_delim +kde_styledir!$kde_styledir$ac_delim +kde_widgetdir!$kde_widgetdir$ac_delim +LIB_KDED!$LIB_KDED$ac_delim +LIB_KDECORE!$LIB_KDECORE$ac_delim +LIB_KDEUI!$LIB_KDEUI$ac_delim +LIB_KIO!$LIB_KIO$ac_delim +LIB_KJS!$LIB_KJS$ac_delim +LIB_SMB!$LIB_SMB$ac_delim +LIB_KAB!$LIB_KAB$ac_delim +LIB_KABC!$LIB_KABC$ac_delim +LIB_KHTML!$LIB_KHTML$ac_delim +LIB_KSPELL!$LIB_KSPELL$ac_delim +LIB_KPARTS!$LIB_KPARTS$ac_delim +LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim +LIB_KUTILS!$LIB_KUTILS$ac_delim +LIB_KDEPIM!$LIB_KDEPIM$ac_delim +LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim +LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim +LIB_KDNSSD!$LIB_KDNSSD$ac_delim +LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim +LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim +LIB_KFILE!$LIB_KFILE$ac_delim +LIB_KFM!$LIB_KFM$ac_delim +PAMLIBS!$PAMLIBS$ac_delim +LIBSHADOW!$LIBSHADOW$ac_delim +LIBGEN!$LIBGEN$ac_delim +SETUIDFLAGS!$SETUIDFLAGS$ac_delim +PASSWDLIBS!$PASSWDLIBS$ac_delim +KDM_PAM_SERVICE!$KDM_PAM_SERVICE$ac_delim +KCHECKPASS_PAM_SERVICE!$KCHECKPASS_PAM_SERVICE$ac_delim +KSCREENSAVER_PAM_SERVICE!$KSCREENSAVER_PAM_SERVICE$ac_delim +LIBALIB!$LIBALIB$ac_delim +LIBRPC!$LIBRPC$ac_delim +LIBOSSAUDIO!$LIBOSSAUDIO$ac_delim +LIBCFG!$LIBCFG$ac_delim +LIBODM!$LIBODM$ac_delim +LIBCURSES!$LIBCURSES$ac_delim +LIBKSTAT!$LIBKSTAT$ac_delim +LIBDEVINFO!$LIBDEVINFO$ac_delim +JAVAC!$JAVAC$ac_delim +JAVAH!$JAVAH$ac_delim +JAR!$JAR$ac_delim +JVMLIBS!$JVMLIBS$ac_delim +jni_includes!$jni_includes$ac_delim +MD5SUM!$MD5SUM$ac_delim +MD5SUM_CUT!$MD5SUM_CUT$ac_delim +XTESTLIB!$XTESTLIB$ac_delim +LIB_XCURSOR!$LIB_XCURSOR$ac_delim +have_xcursor_TRUE!$have_xcursor_TRUE$ac_delim +have_xcursor_FALSE!$have_xcursor_FALSE$ac_delim +QTDOCDIR!$QTDOCDIR$ac_delim +KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim +DOXYGEN!$DOXYGEN$ac_delim +DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim +DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim +KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim +KDE_BINDIR!$KDE_BINDIR$ac_delim +LIBART_LIBS!$LIBART_LIBS$ac_delim +LIBART_CFLAGS!$LIBART_CFLAGS$ac_delim +LIBART_RPATH!$LIBART_RPATH$ac_delim +RUN_KAPPFINDER!$RUN_KAPPFINDER$ac_delim +include_kcontrol_access_TRUE!$include_kcontrol_access_TRUE$ac_delim +include_kcontrol_access_FALSE!$include_kcontrol_access_FALSE$ac_delim +include_kcontrol_accessibility_TRUE!$include_kcontrol_accessibility_TRUE$ac_delim +include_kcontrol_accessibility_FALSE!$include_kcontrol_accessibility_FALSE$ac_delim +SSL_INCLUDES!$SSL_INCLUDES$ac_delim +SSL_LDFLAGS!$SSL_LDFLAGS$ac_delim +LIBSSL!$LIBSSL$ac_delim +DPMSINC!$DPMSINC$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +DPMSLIB!$DPMSLIB$ac_delim +LIBFONTCONFIG_LIBS!$LIBFONTCONFIG_LIBS$ac_delim +LIBFONTCONFIG_CFLAGS!$LIBFONTCONFIG_CFLAGS$ac_delim +LIBFONTCONFIG_RPATH!$LIBFONTCONFIG_RPATH$ac_delim +LIB_TRU64_MACH!$LIB_TRU64_MACH$ac_delim +GLINC!$GLINC$ac_delim +GLLIB!$GLLIB$ac_delim +COMPILE_GL_INFO_TRUE!$COMPILE_GL_INFO_TRUE$ac_delim +COMPILE_GL_INFO_FALSE!$COMPILE_GL_INFO_FALSE$ac_delim +LIBUSBCONFIG!$LIBUSBCONFIG$ac_delim +USB_LIBS!$USB_LIBS$ac_delim +USB_CFLAGS!$USB_CFLAGS$ac_delim +include_kcontrol_joystick_TRUE!$include_kcontrol_joystick_TRUE$ac_delim +include_kcontrol_joystick_FALSE!$include_kcontrol_joystick_FALSE$ac_delim +LIBFREETYPE_LIBS!$LIBFREETYPE_LIBS$ac_delim +LIBFREETYPE_CFLAGS!$LIBFREETYPE_CFLAGS$ac_delim +LIBFREETYPE_RPATH!$LIBFREETYPE_RPATH$ac_delim +UNAME!$UNAME$ac_delim +LIB_FONT_ENC!$LIB_FONT_ENC$ac_delim +LIBXFT_LIB!$LIBXFT_LIB$ac_delim +include_fontinst_tn_TRUE!$include_fontinst_tn_TRUE$ac_delim +include_fontinst_tn_FALSE!$include_fontinst_tn_FALSE$ac_delim +include_kcontrol_kfontinst_TRUE!$include_kcontrol_kfontinst_TRUE$ac_delim +include_kcontrol_kfontinst_FALSE!$include_kcontrol_kfontinst_FALSE$ac_delim +LIB_XRANDR!$LIB_XRANDR$ac_delim +include_kcontrol_randr_TRUE!$include_kcontrol_randr_TRUE$ac_delim +include_kcontrol_randr_FALSE!$include_kcontrol_randr_FALSE$ac_delim +include_kcontrol_smartcard_TRUE!$include_kcontrol_smartcard_TRUE$ac_delim +include_kcontrol_smartcard_FALSE!$include_kcontrol_smartcard_FALSE$ac_delim +include_kcontrol_usbview_TRUE!$include_kcontrol_usbview_TRUE$ac_delim +include_kcontrol_usbview_FALSE!$include_kcontrol_usbview_FALSE$ac_delim +install_usbids_TRUE!$install_usbids_TRUE$ac_delim +install_usbids_FALSE!$install_usbids_FALSE$ac_delim +include_kcontrol_view1394_TRUE!$include_kcontrol_view1394_TRUE$ac_delim +include_kcontrol_view1394_FALSE!$include_kcontrol_view1394_FALSE$ac_delim +LIB_XSS!$LIB_XSS$ac_delim +LIB_XF86MISC!$LIB_XF86MISC$ac_delim +nogroup!$nogroup$ac_delim +LIBXDMCP!$LIBXDMCP$ac_delim +KRB4_INCS!$KRB4_INCS$ac_delim +KRB4_LIBS!$KRB4_LIBS$ac_delim +KRB4_RPATH!$KRB4_RPATH$ac_delim +LIB_LIBS!$LIB_LIBS$ac_delim +LIBPOSIX4!$LIBPOSIX4$ac_delim +KRB5_INCS!$KRB5_INCS$ac_delim +KRB5_LIBS!$KRB5_LIBS$ac_delim +KRB5_RPATH!$KRB5_RPATH$ac_delim +LIB_ARTS!$LIB_ARTS$ac_delim +ARTS_CFLAGS!$ARTS_CFLAGS$ac_delim +KHOTKEYS_ARTS_SUBDIR!$KHOTKEYS_ARTS_SUBDIR$ac_delim +LIB_KVM!$LIB_KVM$ac_delim +LIB_XCOMPOSITE!$LIB_XCOMPOSITE$ac_delim +LIB_XFIXES!$LIB_XFIXES$ac_delim +SASL2_LIBS!$SASL2_LIBS$ac_delim +LIBBZ2!$LIBBZ2$ac_delim +include_BZIP2_TRUE!$include_BZIP2_TRUE$ac_delim +include_BZIP2_FALSE!$include_BZIP2_FALSE$ac_delim +LIB_LBER!$LIB_LBER$ac_delim +LDAP_INCS!$LDAP_INCS$ac_delim +LDAP_LIBS!$LDAP_LIBS$ac_delim +LDAP_RPATH!$LDAP_RPATH$ac_delim +include_kioslave_ldap_TRUE!$include_kioslave_ldap_TRUE$ac_delim +include_kioslave_ldap_FALSE!$include_kioslave_ldap_FALSE$ac_delim +LINUXCDPOLLING!$LINUXCDPOLLING$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +HAL_CFLAGS!$HAL_CFLAGS$ac_delim +HAL_LIBS!$HAL_LIBS$ac_delim +HAL_INCS!$HAL_INCS$ac_delim +DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim +DBUS_LIBS!$DBUS_LIBS$ac_delim +DBUS_INCS!$DBUS_INCS$ac_delim +DBUSQT_INCS!$DBUSQT_INCS$ac_delim +DBUSQT_LIBS!$DBUSQT_LIBS$ac_delim +HALBACKEND!$HALBACKEND$ac_delim +include_media_linuxcdpolling_TRUE!$include_media_linuxcdpolling_TRUE$ac_delim +include_media_linuxcdpolling_FALSE!$include_media_linuxcdpolling_FALSE$ac_delim +include_media_halbackend_TRUE!$include_media_halbackend_TRUE$ac_delim +include_media_halbackend_FALSE!$include_media_halbackend_FALSE$ac_delim +SMBCLIENT_EXTRA_LIBS!$SMBCLIENT_EXTRA_LIBS$ac_delim +include_kioslave_smb_TRUE!$include_kioslave_smb_TRUE$ac_delim +include_kioslave_smb_FALSE!$include_kioslave_smb_FALSE$ac_delim +LIB_EXR!$LIB_EXR$ac_delim +EXR_FLAGS!$EXR_FLAGS$ac_delim +include_EXR_MODULES_TRUE!$include_EXR_MODULES_TRUE$ac_delim +include_EXR_MODULES_FALSE!$include_EXR_MODULES_FALSE$ac_delim +LIBMALLOC!$LIBMALLOC$ac_delim +LIB_XINERAMA!$LIB_XINERAMA$ac_delim +include_ksysguardd_TRUE!$include_ksysguardd_TRUE$ac_delim +include_ksysguardd_FALSE!$include_ksysguardd_FALSE$ac_delim +include_ksysguardd_linux_TRUE!$include_ksysguardd_linux_TRUE$ac_delim +include_ksysguardd_linux_FALSE!$include_ksysguardd_linux_FALSE$ac_delim +include_ksysguardd_freebsd_TRUE!$include_ksysguardd_freebsd_TRUE$ac_delim +include_ksysguardd_freebsd_FALSE!$include_ksysguardd_freebsd_FALSE$ac_delim +include_ksysguardd_netbsd_TRUE!$include_ksysguardd_netbsd_TRUE$ac_delim +include_ksysguardd_netbsd_FALSE!$include_ksysguardd_netbsd_FALSE$ac_delim +include_ksysguardd_solaris_TRUE!$include_ksysguardd_solaris_TRUE$ac_delim +include_ksysguardd_solaris_FALSE!$include_ksysguardd_solaris_FALSE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +include_ksysguardd_tru64_TRUE!$include_ksysguardd_tru64_TRUE$ac_delim +include_ksysguardd_tru64_FALSE!$include_ksysguardd_tru64_FALSE$ac_delim +include_ksysguardd_irix_TRUE!$include_ksysguardd_irix_TRUE$ac_delim +include_ksysguardd_irix_FALSE!$include_ksysguardd_irix_FALSE$ac_delim +include_ksysguardd_openbsd_TRUE!$include_ksysguardd_openbsd_TRUE$ac_delim +include_ksysguardd_openbsd_FALSE!$include_ksysguardd_openbsd_FALSE$ac_delim +LIBHOSTS!$LIBHOSTS$ac_delim +LIBSENSORS!$LIBSENSORS$ac_delim +supports_i8k_TRUE!$supports_i8k_TRUE$ac_delim +supports_i8k_FALSE!$supports_i8k_FALSE$ac_delim +LIB_DNSSD!$LIB_DNSSD$ac_delim +HAVE_DNSSD_TRUE!$HAVE_DNSSD_TRUE$ac_delim +HAVE_DNSSD_FALSE!$HAVE_DNSSD_FALSE$ac_delim +include_kompmgr_TRUE!$include_kompmgr_TRUE$ac_delim +include_kompmgr_FALSE!$include_kompmgr_FALSE$ac_delim +TOPSUBDIRS!$TOPSUBDIRS$ac_delim +libkonq_SUBDIR_included_TRUE!$libkonq_SUBDIR_included_TRUE$ac_delim +libkonq_SUBDIR_included_FALSE!$libkonq_SUBDIR_included_FALSE$ac_delim +applnk_SUBDIR_included_TRUE!$applnk_SUBDIR_included_TRUE$ac_delim +applnk_SUBDIR_included_FALSE!$applnk_SUBDIR_included_FALSE$ac_delim +doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim +doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim +drkonqi_SUBDIR_included_TRUE!$drkonqi_SUBDIR_included_TRUE$ac_delim +drkonqi_SUBDIR_included_FALSE!$drkonqi_SUBDIR_included_FALSE$ac_delim +kappfinder_SUBDIR_included_TRUE!$kappfinder_SUBDIR_included_TRUE$ac_delim +kappfinder_SUBDIR_included_FALSE!$kappfinder_SUBDIR_included_FALSE$ac_delim +kate_SUBDIR_included_TRUE!$kate_SUBDIR_included_TRUE$ac_delim +kate_SUBDIR_included_FALSE!$kate_SUBDIR_included_FALSE$ac_delim +kcheckpass_SUBDIR_included_TRUE!$kcheckpass_SUBDIR_included_TRUE$ac_delim +kcheckpass_SUBDIR_included_FALSE!$kcheckpass_SUBDIR_included_FALSE$ac_delim +kcminit_SUBDIR_included_TRUE!$kcminit_SUBDIR_included_TRUE$ac_delim +kcminit_SUBDIR_included_FALSE!$kcminit_SUBDIR_included_FALSE$ac_delim +kdcop_SUBDIR_included_TRUE!$kdcop_SUBDIR_included_TRUE$ac_delim +kdcop_SUBDIR_included_FALSE!$kdcop_SUBDIR_included_FALSE$ac_delim +kdebugdialog_SUBDIR_included_TRUE!$kdebugdialog_SUBDIR_included_TRUE$ac_delim +kdebugdialog_SUBDIR_included_FALSE!$kdebugdialog_SUBDIR_included_FALSE$ac_delim +kdeeject_SUBDIR_included_TRUE!$kdeeject_SUBDIR_included_TRUE$ac_delim +kdeeject_SUBDIR_included_FALSE!$kdeeject_SUBDIR_included_FALSE$ac_delim +kdepasswd_SUBDIR_included_TRUE!$kdepasswd_SUBDIR_included_TRUE$ac_delim +kdepasswd_SUBDIR_included_FALSE!$kdepasswd_SUBDIR_included_FALSE$ac_delim +kdeprint_SUBDIR_included_TRUE!$kdeprint_SUBDIR_included_TRUE$ac_delim +kdeprint_SUBDIR_included_FALSE!$kdeprint_SUBDIR_included_FALSE$ac_delim +kdesu_SUBDIR_included_TRUE!$kdesu_SUBDIR_included_TRUE$ac_delim +kdesu_SUBDIR_included_FALSE!$kdesu_SUBDIR_included_FALSE$ac_delim +kdialog_SUBDIR_included_TRUE!$kdialog_SUBDIR_included_TRUE$ac_delim +kdialog_SUBDIR_included_FALSE!$kdialog_SUBDIR_included_FALSE$ac_delim +kdmlib_SUBDIR_included_TRUE!$kdmlib_SUBDIR_included_TRUE$ac_delim +kdmlib_SUBDIR_included_FALSE!$kdmlib_SUBDIR_included_FALSE$ac_delim +kfind_SUBDIR_included_TRUE!$kfind_SUBDIR_included_TRUE$ac_delim +kfind_SUBDIR_included_FALSE!$kfind_SUBDIR_included_FALSE$ac_delim +khelpcenter_SUBDIR_included_TRUE!$khelpcenter_SUBDIR_included_TRUE$ac_delim +khelpcenter_SUBDIR_included_FALSE!$khelpcenter_SUBDIR_included_FALSE$ac_delim +khotkeys_SUBDIR_included_TRUE!$khotkeys_SUBDIR_included_TRUE$ac_delim +khotkeys_SUBDIR_included_FALSE!$khotkeys_SUBDIR_included_FALSE$ac_delim +kioslave_SUBDIR_included_TRUE!$kioslave_SUBDIR_included_TRUE$ac_delim +kioslave_SUBDIR_included_FALSE!$kioslave_SUBDIR_included_FALSE$ac_delim +klipper_SUBDIR_included_TRUE!$klipper_SUBDIR_included_TRUE$ac_delim +klipper_SUBDIR_included_FALSE!$klipper_SUBDIR_included_FALSE$ac_delim +kmenuedit_SUBDIR_included_TRUE!$kmenuedit_SUBDIR_included_TRUE$ac_delim +kmenuedit_SUBDIR_included_FALSE!$kmenuedit_SUBDIR_included_FALSE$ac_delim +knetattach_SUBDIR_included_TRUE!$knetattach_SUBDIR_included_TRUE$ac_delim +knetattach_SUBDIR_included_FALSE!$knetattach_SUBDIR_included_FALSE$ac_delim +konsole_SUBDIR_included_TRUE!$konsole_SUBDIR_included_TRUE$ac_delim +konsole_SUBDIR_included_FALSE!$konsole_SUBDIR_included_FALSE$ac_delim +kpager_SUBDIR_included_TRUE!$kpager_SUBDIR_included_TRUE$ac_delim +kpager_SUBDIR_included_FALSE!$kpager_SUBDIR_included_FALSE$ac_delim +kpersonalizer_SUBDIR_included_TRUE!$kpersonalizer_SUBDIR_included_TRUE$ac_delim +kpersonalizer_SUBDIR_included_FALSE!$kpersonalizer_SUBDIR_included_FALSE$ac_delim +kreadconfig_SUBDIR_included_TRUE!$kreadconfig_SUBDIR_included_TRUE$ac_delim +kreadconfig_SUBDIR_included_FALSE!$kreadconfig_SUBDIR_included_FALSE$ac_delim +kscreensaver_SUBDIR_included_TRUE!$kscreensaver_SUBDIR_included_TRUE$ac_delim +kscreensaver_SUBDIR_included_FALSE!$kscreensaver_SUBDIR_included_FALSE$ac_delim +ksplashml_SUBDIR_included_TRUE!$ksplashml_SUBDIR_included_TRUE$ac_delim +ksplashml_SUBDIR_included_FALSE!$ksplashml_SUBDIR_included_FALSE$ac_delim +kstart_SUBDIR_included_TRUE!$kstart_SUBDIR_included_TRUE$ac_delim +kstart_SUBDIR_included_FALSE!$kstart_SUBDIR_included_FALSE$ac_delim +ksysguard_SUBDIR_included_TRUE!$ksysguard_SUBDIR_included_TRUE$ac_delim +ksysguard_SUBDIR_included_FALSE!$ksysguard_SUBDIR_included_FALSE$ac_delim +ksystraycmd_SUBDIR_included_TRUE!$ksystraycmd_SUBDIR_included_TRUE$ac_delim +ksystraycmd_SUBDIR_included_FALSE!$ksystraycmd_SUBDIR_included_FALSE$ac_delim +ktip_SUBDIR_included_TRUE!$ktip_SUBDIR_included_TRUE$ac_delim +ktip_SUBDIR_included_FALSE!$ktip_SUBDIR_included_FALSE$ac_delim +kwin_SUBDIR_included_TRUE!$kwin_SUBDIR_included_TRUE$ac_delim +kwin_SUBDIR_included_FALSE!$kwin_SUBDIR_included_FALSE$ac_delim +kxkb_SUBDIR_included_TRUE!$kxkb_SUBDIR_included_TRUE$ac_delim +kxkb_SUBDIR_included_FALSE!$kxkb_SUBDIR_included_FALSE$ac_delim +l10n_SUBDIR_included_TRUE!$l10n_SUBDIR_included_TRUE$ac_delim +l10n_SUBDIR_included_FALSE!$l10n_SUBDIR_included_FALSE$ac_delim +nsplugins_SUBDIR_included_TRUE!$nsplugins_SUBDIR_included_TRUE$ac_delim +nsplugins_SUBDIR_included_FALSE!$nsplugins_SUBDIR_included_FALSE$ac_delim +pics_SUBDIR_included_TRUE!$pics_SUBDIR_included_TRUE$ac_delim +pics_SUBDIR_included_FALSE!$pics_SUBDIR_included_FALSE$ac_delim +konqueror_SUBDIR_included_TRUE!$konqueror_SUBDIR_included_TRUE$ac_delim +konqueror_SUBDIR_included_FALSE!$konqueror_SUBDIR_included_FALSE$ac_delim +ksmserver_SUBDIR_included_TRUE!$ksmserver_SUBDIR_included_TRUE$ac_delim +ksmserver_SUBDIR_included_FALSE!$ksmserver_SUBDIR_included_FALSE$ac_delim +kicker_SUBDIR_included_TRUE!$kicker_SUBDIR_included_TRUE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +kicker_SUBDIR_included_FALSE!$kicker_SUBDIR_included_FALSE$ac_delim +kcontrol_SUBDIR_included_TRUE!$kcontrol_SUBDIR_included_TRUE$ac_delim +kcontrol_SUBDIR_included_FALSE!$kcontrol_SUBDIR_included_FALSE$ac_delim +kdesktop_SUBDIR_included_TRUE!$kdesktop_SUBDIR_included_TRUE$ac_delim +kdesktop_SUBDIR_included_FALSE!$kdesktop_SUBDIR_included_FALSE$ac_delim +kdm_SUBDIR_included_TRUE!$kdm_SUBDIR_included_TRUE$ac_delim +kdm_SUBDIR_included_FALSE!$kdm_SUBDIR_included_FALSE$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-6.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof _ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac _ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -59441,248 +59205,130 @@ cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" | sed -f "$tmp/subs-6.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - + ;; + :H) + # + # CONFIG_HEADER + # _ACEOF -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' -# This sed command replaces #undef with comments. This is necessary, for +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : +do + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def _ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi + rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. _am_stamp_count=1 for _am_header in $config_headers :; do @@ -59693,135 +59339,39 @@ _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X$ac_file : 'X\(//\)[^/]' \| \ X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X$ac_file : 'X\(/\)' \| . 2>/dev/null || echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -59831,18 +59381,29 @@ # each Makefile.in and add a new line on top of each file to say so. # So let's grep whole file. if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -59864,53 +59425,79 @@ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF --- kdebase-3.5.6.orig/Makefile.in +++ kdebase-3.5.6/Makefile.in @@ -145,6 +145,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -288,6 +289,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -338,6 +342,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -345,12 +350,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -371,10 +373,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -383,6 +388,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -544,6 +550,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -551,10 +558,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -591,7 +600,7 @@ .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -633,12 +642,12 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) #>- cd $(srcdir) && $(AUTOCONF) #>+ 2 cd $(srcdir) && rm -f configure cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -650,7 +659,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ @@ -1187,7 +1196,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=startkde Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in +KDE_DIST=stamp-h.in startkde Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in #>+ 2 docs-am: --- kdebase-3.5.6.orig/kcontrol/filetypes/Makefile.in +++ kdebase-3.5.6/kcontrol/filetypes/Makefile.in @@ -176,6 +176,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -319,6 +320,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -369,6 +373,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -376,12 +381,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -402,10 +404,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -414,6 +419,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -575,6 +581,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -582,10 +589,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -632,7 +641,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -670,9 +679,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/smartcard/Makefile.in +++ kdebase-3.5.6/kcontrol/smartcard/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/info/Makefile.in +++ kdebase-3.5.6/kcontrol/info/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -606,7 +615,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -644,9 +653,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/clock/Makefile.in +++ kdebase-3.5.6/kcontrol/clock/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -597,7 +606,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -635,9 +644,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/arts/Makefile.in +++ kdebase-3.5.6/kcontrol/arts/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/konqhtml/Makefile.in +++ kdebase-3.5.6/kcontrol/konqhtml/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -616,7 +625,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -654,9 +663,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kdm/Makefile.in +++ kdebase-3.5.6/kcontrol/kdm/Makefile.in @@ -161,6 +161,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -304,6 +305,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -354,6 +358,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -361,12 +366,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -387,10 +389,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -399,6 +404,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -560,6 +566,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -567,10 +574,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -612,7 +621,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -650,9 +659,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/taskbar/Makefile.in +++ kdebase-3.5.6/kcontrol/taskbar/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/spellchecking/Makefile.in +++ kdebase-3.5.6/kcontrol/spellchecking/Makefile.in @@ -149,6 +149,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -292,6 +293,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -342,6 +346,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -349,12 +354,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -375,10 +377,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -387,6 +392,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -548,6 +554,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -555,10 +562,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -593,7 +602,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -631,9 +640,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/display/Makefile.in +++ kdebase-3.5.6/kcontrol/display/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/xinerama/Makefile.in +++ kdebase-3.5.6/kcontrol/xinerama/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/colors/Makefile.in +++ kdebase-3.5.6/kcontrol/colors/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -602,7 +611,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -640,9 +649,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/pics/Makefile.in +++ kdebase-3.5.6/kcontrol/pics/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -542,7 +551,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -580,9 +589,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/kthememanager/Makefile.in +++ kdebase-3.5.6/kcontrol/kthememanager/Makefile.in @@ -162,6 +162,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -305,6 +306,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -355,6 +359,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -362,12 +367,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -388,10 +390,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -400,6 +405,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -561,6 +567,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -568,10 +575,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -612,7 +621,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -650,9 +659,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kded/Makefile.in +++ kdebase-3.5.6/kcontrol/kded/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/performance/Makefile.in +++ kdebase-3.5.6/kcontrol/performance/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -609,7 +618,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -647,9 +656,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/ioslaveinfo/Makefile.in +++ kdebase-3.5.6/kcontrol/ioslaveinfo/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/dnssd/Makefile.in +++ kdebase-3.5.6/kcontrol/dnssd/Makefile.in @@ -162,6 +162,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -305,6 +306,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -355,6 +359,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -362,12 +367,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -388,10 +390,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -400,6 +405,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -561,6 +567,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -568,10 +575,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -608,7 +617,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -646,9 +655,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/Makefile.in +++ kdebase-3.5.6/kcontrol/Makefile.in @@ -129,6 +129,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -272,6 +273,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -322,6 +326,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -329,12 +334,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -355,10 +357,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -367,6 +372,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -528,6 +534,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -535,10 +542,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -582,7 +591,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -620,9 +629,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/componentchooser/componentservices/Makefile.in +++ kdebase-3.5.6/kcontrol/componentchooser/componentservices/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/componentchooser/Makefile.in +++ kdebase-3.5.6/kcontrol/componentchooser/Makefile.in @@ -170,6 +170,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -313,6 +314,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -363,6 +367,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -370,12 +375,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -396,10 +398,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -408,6 +413,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -569,6 +575,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -576,10 +583,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -617,7 +626,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -655,9 +664,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kcontrol/Makefile.in +++ kdebase-3.5.6/kcontrol/kcontrol/Makefile.in @@ -206,6 +206,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -349,6 +350,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -399,6 +403,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -406,12 +411,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -432,10 +434,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -444,6 +449,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -605,6 +611,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -612,10 +619,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -671,7 +680,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -709,9 +718,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kcontrol/about/Makefile.in +++ kdebase-3.5.6/kcontrol/kcontrol/about/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/bell/Makefile.in +++ kdebase-3.5.6/kcontrol/bell/Makefile.in @@ -149,6 +149,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -292,6 +293,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -342,6 +346,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -349,12 +354,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -375,10 +377,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -387,6 +392,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -548,6 +554,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -555,10 +562,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -593,7 +602,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -631,9 +640,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/css/Makefile.in +++ kdebase-3.5.6/kcontrol/css/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -602,7 +611,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -640,9 +649,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/input/pics/Makefile.in +++ kdebase-3.5.6/kcontrol/input/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/input/Makefile.in +++ kdebase-3.5.6/kcontrol/input/Makefile.in @@ -185,6 +185,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -328,6 +329,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -378,6 +382,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -385,12 +390,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -411,10 +413,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -423,6 +428,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -584,6 +590,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -591,10 +598,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -646,7 +655,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -684,9 +693,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/input/core/Makefile.in +++ kdebase-3.5.6/kcontrol/input/core/Makefile.in @@ -140,6 +140,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -283,6 +284,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -333,6 +337,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -340,12 +345,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -366,10 +368,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -378,6 +383,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -539,6 +545,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -546,10 +553,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -580,7 +589,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -618,9 +627,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kcontrol/input/xcursor/Makefile.in +++ kdebase-3.5.6/kcontrol/input/xcursor/Makefile.in @@ -143,6 +143,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -286,6 +287,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -336,6 +340,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -343,12 +348,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -369,10 +371,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -381,6 +386,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -542,6 +548,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -549,10 +556,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -583,7 +592,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -621,9 +630,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kcontrol/style/keramik/Makefile.in +++ kdebase-3.5.6/kcontrol/style/keramik/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -592,7 +601,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -630,9 +639,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/style/Makefile.in +++ kdebase-3.5.6/kcontrol/style/Makefile.in @@ -172,6 +172,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -315,6 +316,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -365,6 +369,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -372,12 +377,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -398,10 +400,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -410,6 +415,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -571,6 +577,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -578,10 +585,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -620,7 +629,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -658,9 +667,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/icons/Makefile.in +++ kdebase-3.5.6/kcontrol/icons/Makefile.in @@ -162,6 +162,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -305,6 +306,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -355,6 +359,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -362,12 +367,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -388,10 +390,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -400,6 +405,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -561,6 +567,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -568,10 +575,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -610,7 +619,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -648,9 +657,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/randr/Makefile.in +++ kdebase-3.5.6/kcontrol/randr/Makefile.in @@ -183,6 +183,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -326,6 +327,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -376,6 +380,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -383,12 +388,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -409,10 +411,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -421,6 +426,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -582,6 +588,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -589,10 +596,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -638,7 +647,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -676,9 +685,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/knotify/Makefile.in +++ kdebase-3.5.6/kcontrol/knotify/Makefile.in @@ -171,6 +171,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -314,6 +315,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -364,6 +368,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -371,12 +376,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -397,10 +399,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -409,6 +414,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -570,6 +576,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -577,10 +584,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -621,7 +630,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -659,9 +668,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/knotify/sounds/Makefile.in +++ kdebase-3.5.6/kcontrol/knotify/sounds/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -663,7 +672,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -701,9 +710,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/access/Makefile.in +++ kdebase-3.5.6/kcontrol/access/Makefile.in @@ -180,6 +180,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -323,6 +324,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -373,6 +377,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -380,12 +385,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -406,10 +408,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -418,6 +423,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -579,6 +585,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -586,10 +593,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -638,7 +647,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -676,9 +685,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/smserver/Makefile.in +++ kdebase-3.5.6/kcontrol/smserver/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kicker/Makefile.in +++ kdebase-3.5.6/kcontrol/kicker/Makefile.in @@ -166,6 +166,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -309,6 +310,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -359,6 +363,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -366,12 +371,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -392,10 +394,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -404,6 +409,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -565,6 +571,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -572,10 +579,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -632,7 +641,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -670,9 +679,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/privacy/Makefile.in +++ kdebase-3.5.6/kcontrol/privacy/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kio/Makefile.in +++ kdebase-3.5.6/kcontrol/kio/Makefile.in @@ -182,6 +182,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -325,6 +326,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -375,6 +379,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -382,12 +387,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -408,10 +410,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -420,6 +425,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -581,6 +587,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -588,10 +595,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -651,7 +660,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -689,9 +698,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kio/uasproviders/Makefile.in +++ kdebase-3.5.6/kcontrol/kio/uasproviders/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -564,7 +573,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -602,9 +611,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/keys/Makefile.in +++ kdebase-3.5.6/kcontrol/keys/Makefile.in @@ -161,6 +161,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -304,6 +305,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -354,6 +358,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -361,12 +366,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -387,10 +389,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -399,6 +404,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -560,6 +566,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -567,10 +574,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -610,7 +619,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -648,9 +657,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/energy/pics/Makefile.in +++ kdebase-3.5.6/kcontrol/energy/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/energy/Makefile.in +++ kdebase-3.5.6/kcontrol/energy/Makefile.in @@ -168,6 +168,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -311,6 +312,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -361,6 +365,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -368,12 +373,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -394,10 +396,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -406,6 +411,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -567,6 +573,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -574,10 +581,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -615,7 +624,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -653,9 +662,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/accessibility/Makefile.in +++ kdebase-3.5.6/kcontrol/accessibility/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/konq/Makefile.in +++ kdebase-3.5.6/kcontrol/konq/Makefile.in @@ -161,6 +161,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -304,6 +305,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -354,6 +358,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -361,12 +366,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -387,10 +389,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -399,6 +404,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -560,6 +566,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -567,10 +574,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -621,7 +630,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -659,9 +668,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/launch/Makefile.in +++ kdebase-3.5.6/kcontrol/launch/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -596,7 +605,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -634,9 +643,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/nics/Makefile.in +++ kdebase-3.5.6/kcontrol/nics/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/screensaver/Makefile.in +++ kdebase-3.5.6/kcontrol/screensaver/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -609,7 +618,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -647,9 +656,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/krdb/pics/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/Makefile.in @@ -162,6 +162,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -305,6 +306,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -355,6 +359,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -362,12 +367,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -388,10 +390,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -400,6 +405,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -561,6 +567,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -568,10 +575,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -607,7 +616,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -645,9 +654,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kcontrol/krdb/kcs/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/kcs/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -561,7 +570,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -599,9 +608,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/HighContrastLight-big/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/YellowOnBlue/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/YellowOnBlue/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -562,7 +571,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -600,9 +609,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/HighContrastDark/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/HighContrastDark/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/KDE_Classic/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/KDE_Classic/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/Redmond/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/Redmond/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/HighContrastLight/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/HighContrastLight/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/Sunshine/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/Sunshine/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/Plastik/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/Plastik/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/Keramik/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/Keramik/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/Platinum/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/Platinum/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/themes/HighContrastDark-big/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/krdb/ad/Makefile.in +++ kdebase-3.5.6/kcontrol/krdb/ad/Makefile.in @@ -121,6 +121,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -264,6 +265,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -314,6 +318,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -321,12 +326,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -347,10 +349,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -359,6 +364,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -520,6 +526,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -527,10 +534,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -563,7 +572,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -601,9 +610,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kfontinst/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/Makefile.in @@ -135,6 +135,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -278,6 +279,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,6 +332,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -335,12 +340,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -361,10 +363,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -373,6 +378,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -534,6 +540,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -541,10 +548,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -575,7 +584,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -613,9 +622,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/kfontinst/thumbnail/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/thumbnail/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kfontinst/viewpart/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/viewpart/Makefile.in @@ -179,6 +179,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -322,6 +323,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -372,6 +376,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -379,12 +384,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -405,10 +407,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -417,6 +422,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -578,6 +584,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -585,10 +592,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -632,7 +641,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -670,9 +679,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kfontinst/kio/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/kio/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -613,7 +622,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -651,9 +660,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kfontinst/kcmfontinst/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/kcmfontinst/Makefile.in @@ -162,6 +162,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -305,6 +306,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -355,6 +359,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -362,12 +367,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -388,10 +390,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -400,6 +405,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -561,6 +567,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -568,10 +575,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -624,7 +633,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -662,9 +671,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kfontinst/kfile-plugin/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/kfile-plugin/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kfontinst/kfontinst/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/kfontinst/Makefile.in @@ -162,6 +162,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -305,6 +306,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -355,6 +359,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -362,12 +367,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -388,10 +390,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -400,6 +405,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -561,6 +567,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -568,10 +575,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -616,7 +625,7 @@ .SUFFIXES: .SUFFIXES: .c .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -654,9 +663,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/kfontinst/lib/Makefile.in +++ kdebase-3.5.6/kcontrol/kfontinst/lib/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -604,7 +613,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -642,9 +651,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/locale/default/Makefile.in +++ kdebase-3.5.6/kcontrol/locale/default/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/locale/pics/Makefile.in +++ kdebase-3.5.6/kcontrol/locale/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/locale/Makefile.in +++ kdebase-3.5.6/kcontrol/locale/Makefile.in @@ -176,6 +176,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -319,6 +320,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -369,6 +373,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -376,12 +381,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -402,10 +404,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -414,6 +419,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -575,6 +581,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -582,10 +589,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -622,7 +631,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -660,9 +669,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -1059,7 +1068,7 @@ messages: $(XGETTEXT) -ktranslate $(kcm_locale_la_SOURCES) -o $(podir)/kcmlocale.pot - $(XGETTEXT) TIMEZONES -o $(podir)/../kdelibs/timezones.pot + $(XGETTEXT) TIMEZONES -o $(podir)/timezones.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- kdebase-3.5.6.orig/kcontrol/fonts/Makefile.in +++ kdebase-3.5.6/kcontrol/fonts/Makefile.in @@ -160,6 +160,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -303,6 +304,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -353,6 +357,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -360,12 +365,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -386,10 +388,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -398,6 +403,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -559,6 +565,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -566,10 +573,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -609,7 +618,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -647,9 +656,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/samba/Makefile.in +++ kdebase-3.5.6/kcontrol/samba/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/konsole/Makefile.in +++ kdebase-3.5.6/kcontrol/konsole/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -609,7 +618,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -647,9 +656,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/crypto/Makefile.in +++ kdebase-3.5.6/kcontrol/crypto/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -602,7 +611,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -640,9 +649,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/background/pics/Makefile.in +++ kdebase-3.5.6/kcontrol/background/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/background/Makefile.in +++ kdebase-3.5.6/kcontrol/background/Makefile.in @@ -188,6 +188,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -331,6 +332,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -381,6 +385,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -388,12 +393,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -414,10 +416,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -426,6 +431,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -587,6 +593,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -594,10 +601,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -645,7 +654,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -683,9 +692,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/joystick/Makefile.in +++ kdebase-3.5.6/kcontrol/joystick/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/usbview/Makefile.in +++ kdebase-3.5.6/kcontrol/usbview/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/ebrowsing/Makefile.in +++ kdebase-3.5.6/kcontrol/ebrowsing/Makefile.in @@ -167,6 +167,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -310,6 +311,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -360,6 +364,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -367,12 +372,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -393,10 +395,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -405,6 +410,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -566,6 +572,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -573,10 +580,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -612,7 +621,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -650,9 +659,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in +++ kdebase-3.5.6/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -643,7 +652,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -681,9 +690,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/ebrowsing/plugins/ikws/Makefile.in +++ kdebase-3.5.6/kcontrol/ebrowsing/plugins/ikws/Makefile.in @@ -188,6 +188,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -331,6 +332,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -381,6 +385,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -388,12 +393,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -414,10 +416,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -426,6 +431,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -587,6 +593,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -594,10 +601,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -651,7 +660,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -689,9 +698,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/ebrowsing/plugins/Makefile.in +++ kdebase-3.5.6/kcontrol/ebrowsing/plugins/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kcontrol/ebrowsing/plugins/shorturi/Makefile.in +++ kdebase-3.5.6/kcontrol/ebrowsing/plugins/shorturi/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/ebrowsing/plugins/localdomain/Makefile.in +++ kdebase-3.5.6/kcontrol/ebrowsing/plugins/localdomain/Makefile.in @@ -176,6 +176,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -319,6 +320,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -369,6 +373,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -376,12 +381,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -402,10 +404,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -414,6 +419,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -575,6 +581,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -582,10 +589,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -624,7 +633,7 @@ .SUFFIXES: .SUFFIXES: .c .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -662,9 +671,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcontrol/view1394/Makefile.in +++ kdebase-3.5.6/kcontrol/view1394/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -602,7 +611,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -640,9 +649,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/klipper/Makefile.in +++ kdebase-3.5.6/klipper/Makefile.in @@ -204,6 +204,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -347,6 +348,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -397,6 +401,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -404,12 +409,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -430,10 +432,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -442,6 +447,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -603,6 +609,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -610,10 +617,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -679,7 +688,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -717,9 +726,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdeeject/Makefile.in +++ kdebase-3.5.6/kdeeject/Makefile.in @@ -111,6 +111,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -254,6 +255,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -304,6 +308,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -311,12 +316,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -337,10 +339,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -349,6 +354,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -510,6 +516,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -517,10 +524,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -546,7 +555,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -584,9 +593,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/applnk/Makefile.in +++ kdebase-3.5.6/applnk/Makefile.in @@ -136,6 +136,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -279,6 +280,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -329,6 +333,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -336,12 +341,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -362,10 +364,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -374,6 +379,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -535,6 +541,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -542,10 +549,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -623,7 +632,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -661,9 +670,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/applnk/compat/Makefile.in +++ kdebase-3.5.6/applnk/compat/Makefile.in @@ -119,6 +119,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -262,6 +263,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -312,6 +316,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -319,12 +324,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -345,10 +347,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -357,6 +362,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -518,6 +524,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -525,10 +532,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -559,7 +568,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -597,9 +606,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kpersonalizer/pics/Makefile.in +++ kdebase-3.5.6/kpersonalizer/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kpersonalizer/Makefile.in +++ kdebase-3.5.6/kpersonalizer/Makefile.in @@ -173,6 +173,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -316,6 +317,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -366,6 +370,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -373,12 +378,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -399,10 +401,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -411,6 +416,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -572,6 +578,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -579,10 +586,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -646,7 +655,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -684,9 +693,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdesktop/pics/Makefile.in +++ kdebase-3.5.6/kdesktop/pics/Makefile.in @@ -119,6 +119,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -262,6 +263,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -312,6 +316,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -319,12 +324,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -345,10 +347,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -357,6 +362,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -518,6 +524,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -525,10 +532,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdesktop/lock/Makefile.in +++ kdebase-3.5.6/kdesktop/lock/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -595,7 +604,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -633,9 +642,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdesktop/Makefile.in +++ kdebase-3.5.6/kdesktop/Makefile.in @@ -68,8 +68,8 @@ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES) \ $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = -#>- kdesktop_la_DEPENDENCIES = libkdesktopsettings.la \ -#>- $(top_builddir)/libkonq/libkonq.la \ +#>- kdesktop_la_DEPENDENCIES = $(top_builddir)/kioslave/media/libmediacommon/libmediacommon.la \ +#>- libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la \ #>- $(top_builddir)/kcontrol/background/libbgnd.la \ #>- $(top_builddir)/kdmlib/libdmctl.la $(am__DEPENDENCIES_1) \ #>- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) @@ -224,6 +224,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -367,6 +368,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -417,6 +421,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -424,12 +429,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -450,10 +452,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -462,6 +467,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -623,6 +629,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -630,10 +637,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -653,9 +662,9 @@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ -INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes) +INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib -I$(top_srcdir)/kioslave/media/libmediacommon $(all_includes) kdesktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -#>- kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR) +#>- kdesktop_la_LIBADD = $(top_builddir)/kioslave/media/libmediacommon/libmediacommon.la libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR) #>+ 1 kdesktop_la_LIBADD = libkdeinit_kdesktop.la SUBDIRS = . lock pics patterns programs init kwebdesktop @@ -670,7 +679,7 @@ #>+ 1 libkdesktopsettings_la_SOURCES= kdesktopsettings.cc klaunchsettings.cc #>- kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ -#>- lockeng.cc KDesktopIface.skel \ +#>- lockeng.cc KDesktopIface.skel kdiconview.skel \ #>- bgmanager.cc init.cc KScreensaverIface.skel \ #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ #>- startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \ @@ -679,12 +688,12 @@ #>+ 8 kdesktop_la_SOURCES = kdesktop_la_dummy.cc libkdeinit_kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ - lockeng.cc \ + lockeng.cc \ bgmanager.cc init.cc \ minicli.cpp pixmapserver.cc kcustommenu.cc \ startupid.cpp xautolock_diy.c xautolock_engine.c \ kshadowengine.cpp kshadowsettings.cpp \ - kdesktopshadowsettings.cpp kfileividesktop.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc + kdesktopshadowsettings.cpp kfileividesktop.cpp KDesktopIface_skel.cc kdiconview_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h noinst_HEADERS = desktop.h bgmanager.h krootwm.h \ @@ -708,7 +717,7 @@ .SUFFIXES: .SUFFIXES: .c .cc .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -746,9 +755,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -1374,14 +1383,14 @@ .NOEXPORT: #>+ 2 -libkdeinit_kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR) +libkdeinit_kdesktop_la_LIBADD = $(top_builddir)/kioslave/media/libmediacommon/libmediacommon.la libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR) #>+ 2 libkdeinit_kdesktop_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries) #>+ 6 -libkdeinit_kdesktop_la_DEPENDENCIES = libkdesktopsettings.la \ - $(top_builddir)/libkonq/libkonq.la \ +libkdeinit_kdesktop_la_DEPENDENCIES = $(top_builddir)/kioslave/media/libmediacommon/libmediacommon.la \ + libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la \ $(top_builddir)/kcontrol/background/libbgnd.la \ $(top_builddir)/kdmlib/libdmctl.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) @@ -1407,11 +1416,15 @@ kdesktop_LDADD = libkdeinit_kdesktop.la kdesktop_DEPENDENCIES = libkdeinit_kdesktop.la -#>+ 13 +#>+ 17 KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; false ) KDesktopIface_skel.cc: KDesktopIface.kidl $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl +kdiconview.kidl: $(srcdir)/kdiconview.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kdiconview.h > kdiconview.kidl || ( rm -f kdiconview.kidl ; false ) +kdiconview_skel.cc: kdiconview.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub kdiconview.kidl KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; false ) KScreensaverIface_skel.cc: KScreensaverIface.kidl @@ -1507,10 +1520,11 @@ #>+ 2 KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h Makefile.am -#>+ 6 +#>+ 7 clean-idl: -rm -f \ KDesktopIface_skel.cc KDesktopIface_skel.h KDesktopIface.kidl \ + kdiconview_skel.cc kdiconview_skel.h kdiconview.kidl \ KScreensaverIface_skel.cc KScreensaverIface_skel.h KScreensaverIface.kidl \ KBackgroundIface_skel.cc KBackgroundIface_skel.h KBackgroundIface.kidl @@ -1571,11 +1585,11 @@ #>+ 11 -libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc kdesktopsettings.h $(srcdir)/krootwm.cc kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc kdesktopsettings.h $(srcdir)/desktop.cc klaunchsettings.h $(srcdir)/lockeng.cc kdesktopsettings.h $(srcdir)/bgmanager.cc kdesktopsettings.h $(srcdir)/init.cc kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc +libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc kdesktopsettings.h $(srcdir)/krootwm.cc kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc kdesktopsettings.h $(srcdir)/desktop.cc klaunchsettings.h $(srcdir)/lockeng.cc kdesktopsettings.h $(srcdir)/bgmanager.cc kdesktopsettings.h $(srcdir)/init.cc kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc kdiconview_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc @echo 'creating libkdeinit_kdesktop_la.all_cc.cc ...'; \ rm -f libkdeinit_kdesktop_la.all_cc.files libkdeinit_kdesktop_la.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cc.final; \ - for file in main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc ; do \ + for file in main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc kdiconview_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc ; do \ echo "#include \"$$file\"" >> libkdeinit_kdesktop_la.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdeinit_kdesktop_la.all_cc.final; \ done; \ @@ -1616,7 +1630,7 @@ desktop.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ pixmapserver.lo kcustommenu.lo startupid.lo xautolock_diy.lo \ xautolock_engine.lo kshadowengine.lo kshadowsettings.lo \ - kdesktopshadowsettings.lo kfileividesktop.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo minicli_ui.lo + kdesktopshadowsettings.lo kfileividesktop.lo KDesktopIface_skel.lo kdiconview_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo minicli_ui.lo @KDE_USE_FINAL_FALSE@libkdeinit_kdesktop_la_OBJECTS = $(libkdeinit_kdesktop_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libkdeinit_kdesktop_la_OBJECTS = $(libkdeinit_kdesktop_la_final_OBJECTS) @@ -1647,8 +1661,8 @@ $(srcdir)/xautolock.cc: minicli_ui.h kdiconview.o: kdiconview.moc $(srcdir)/main.cc: minicli_ui.h -$(srcdir)/kfileividesktop.cpp: minicli_ui.h $(srcdir)/xautolock_engine.c: minicli_ui.h +$(srcdir)/kfileividesktop.cpp: minicli_ui.h $(srcdir)/lockeng.cc: minicli_ui.h $(srcdir)/krootwm.cc: minicli_ui.h pixmapserver.lo: pixmapserver.moc --- kdebase-3.5.6.orig/kdesktop/kwebdesktop/Makefile.in +++ kdebase-3.5.6/kdesktop/kwebdesktop/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -601,7 +610,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -639,9 +648,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdesktop/programs/Makefile.in +++ kdebase-3.5.6/kdesktop/programs/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdesktop/patterns/Makefile.in +++ kdebase-3.5.6/kdesktop/patterns/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdesktop/init/Templates/Makefile.in +++ kdebase-3.5.6/kdesktop/init/Templates/Makefile.in @@ -118,6 +118,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -261,6 +262,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -311,6 +315,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -318,12 +323,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -344,10 +346,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -356,6 +361,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -517,6 +523,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -524,10 +531,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -570,7 +579,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -608,9 +617,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdesktop/init/Makefile.in +++ kdebase-3.5.6/kdesktop/init/Makefile.in @@ -135,6 +135,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -278,6 +279,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,6 +332,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -335,12 +340,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -361,10 +363,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -373,6 +378,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -534,6 +540,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -541,10 +548,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -574,7 +583,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -612,9 +621,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksystraycmd/Makefile.in +++ kdebase-3.5.6/ksystraycmd/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -591,7 +600,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -629,9 +638,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdesu/Makefile.in +++ kdebase-3.5.6/kdesu/Makefile.in @@ -124,6 +124,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -267,6 +268,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,6 +321,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -324,12 +329,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -350,10 +352,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -362,6 +367,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -523,6 +529,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -530,10 +537,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -559,7 +568,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -597,9 +606,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kdesu/kdesud/Makefile.in +++ kdebase-3.5.6/kdesu/kdesud/Makefile.in @@ -149,6 +149,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -292,6 +293,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -342,6 +346,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -349,12 +354,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -375,10 +377,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -387,6 +392,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -548,6 +554,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -555,10 +562,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -590,7 +599,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -628,9 +637,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdesu/kdesu/Makefile.in +++ kdebase-3.5.6/kdesu/kdesu/Makefile.in @@ -147,6 +147,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -290,6 +291,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -340,6 +344,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -347,12 +352,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -373,10 +375,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -385,6 +390,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -546,6 +552,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -553,10 +560,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -588,7 +597,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -626,9 +635,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kcheckpass/Makefile.in +++ kdebase-3.5.6/kcheckpass/Makefile.in @@ -143,6 +143,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -286,6 +287,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -336,6 +340,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -343,12 +348,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -369,10 +371,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -381,6 +386,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -542,6 +548,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -549,10 +556,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -588,7 +597,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -626,9 +635,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khotkeys/arts/Makefile.in +++ kdebase-3.5.6/khotkeys/arts/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khotkeys/shared/Makefile.in +++ kdebase-3.5.6/khotkeys/shared/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -609,7 +618,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -647,9 +656,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khotkeys/Makefile.in +++ kdebase-3.5.6/khotkeys/Makefile.in @@ -134,6 +134,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -277,6 +278,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -327,6 +331,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -334,12 +339,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -360,10 +362,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -372,6 +377,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -533,6 +539,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -540,10 +547,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -572,7 +581,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -610,9 +619,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/khotkeys/kcontrol/ui/Makefile.in +++ kdebase-3.5.6/khotkeys/kcontrol/ui/Makefile.in @@ -142,6 +142,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -285,6 +286,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -335,6 +339,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -342,12 +347,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -368,10 +370,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -380,6 +385,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -541,6 +547,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -548,10 +555,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/khotkeys/kcontrol/Makefile.in +++ kdebase-3.5.6/khotkeys/kcontrol/Makefile.in @@ -197,6 +197,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -340,6 +341,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -390,6 +394,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -397,12 +402,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -423,10 +425,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -435,6 +440,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -596,6 +602,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -603,10 +610,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -667,7 +676,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -705,9 +714,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khotkeys/data/Makefile.in +++ kdebase-3.5.6/khotkeys/data/Makefile.in @@ -119,6 +119,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -262,6 +263,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -312,6 +316,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -319,12 +324,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -345,10 +347,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -357,6 +362,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -518,6 +524,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -525,10 +532,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/khotkeys/update/Makefile.in +++ kdebase-3.5.6/khotkeys/update/Makefile.in @@ -142,6 +142,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -285,6 +286,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -335,6 +339,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -342,12 +347,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -368,10 +370,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -380,6 +385,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -541,6 +547,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -548,10 +555,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -583,7 +592,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -621,9 +630,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kconfPROGRAMS: $(kconf_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khotkeys/app/Makefile.in +++ kdebase-3.5.6/khotkeys/app/Makefile.in @@ -182,6 +182,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -325,6 +326,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -375,6 +379,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -382,12 +387,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -408,10 +410,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -420,6 +425,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -581,6 +587,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -588,10 +595,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -642,7 +651,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -680,9 +689,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/knetattach/Makefile.in +++ kdebase-3.5.6/knetattach/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -597,7 +606,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -635,9 +644,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/aclocal.m4 +++ kdebase-3.5.6/aclocal.m4 @@ -501,6 +501,35 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. --- kdebase-3.5.6.orig/kcminit/Makefile.in +++ kdebase-3.5.6/kcminit/Makefile.in @@ -192,6 +192,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -335,6 +336,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -385,6 +389,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -392,12 +397,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -418,10 +420,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -430,6 +435,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -591,6 +597,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -598,10 +605,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -649,7 +658,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -687,9 +696,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/debian/konsole.install +++ kdebase-3.5.6/debian/konsole.install @@ -0,0 +1,102 @@ +debian/tmp/usr/bin/konsole +debian/tmp/usr/lib/kde3/kcm_konsole.la +debian/tmp/usr/lib/kde3/kcm_konsole.so +debian/tmp/usr/lib/kde3/kded_kwrited.la +debian/tmp/usr/lib/kde3/kded_kwrited.so +debian/tmp/usr/lib/kde3/konsole.la +debian/tmp/usr/lib/kde3/konsole.so +debian/tmp/usr/lib/kde3/libkonsolepart.la +debian/tmp/usr/lib/kde3/libkonsolepart.so +debian/tmp/usr/lib/libkdeinit_konsole.so +debian/tmp/usr/share/applications/kde/konsole.desktop +debian/tmp/usr/share/applications/kde/konsolesu.desktop +debian/tmp/usr/share/applnk/.hidden/kcmkonsole.desktop +debian/tmp/usr/share/apps/kconf_update/konsole.upd +debian/tmp/usr/share/apps/kconf_update/schemaStrip.pl +debian/tmp/usr/share/apps/konqueror/servicemenus/konsolehere.desktop +debian/tmp/usr/share/apps/konsole/BlackOnLightColor.schema +debian/tmp/usr/share/apps/konsole/BlackOnLightYellow.schema +debian/tmp/usr/share/apps/konsole/BlackOnWhite.schema +debian/tmp/usr/share/apps/konsole/DarkPicture.schema +debian/tmp/usr/share/apps/konsole/eventsrc +debian/tmp/usr/share/apps/konsole/Example.Schema +debian/tmp/usr/share/apps/konsole/fonts/9x15.pcf.gz +debian/tmp/usr/share/apps/konsole/fonts/console8x16.pcf.gz +debian/tmp/usr/share/apps/konsole/fonts/fonts.dir +debian/tmp/usr/share/apps/konsole/GreenOnBlack.schema +debian/tmp/usr/share/apps/konsole/GreenTint_MC.schema +debian/tmp/usr/share/apps/konsole/GreenTint.schema +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/16x16/actions/activity.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/16x16/actions/konsoleblue.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/16x16/actions/konsolered.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/16x16/actions/silence.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/22x22/actions/konsoleblue.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/22x22/actions/konsolered.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/22x22/actions/opentermred.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/32x32/actions/konsoleblue.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/32x32/actions/konsolered.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/32x32/actions/opentermblue.png +debian/tmp/usr/share/apps/konsole/icons/crystalsvg/32x32/actions/opentermred.png +debian/tmp/usr/share/apps/konsole/LightPaper.schema +debian/tmp/usr/share/apps/konsole/LightPicture.schema +debian/tmp/usr/share/apps/konsole/linux.desktop +debian/tmp/usr/share/apps/konsole/linux.keytab +debian/tmp/usr/share/apps/konsole/Linux.schema +debian/tmp/usr/share/apps/konsole/mc.desktop +debian/tmp/usr/share/apps/konsole/profiles/2shells +debian/tmp/usr/share/apps/konsole/profiles/3shells +debian/tmp/usr/share/apps/konsole/profiles/4shells +debian/tmp/usr/share/apps/konsole/profiles/5shells +debian/tmp/usr/share/apps/konsole/screen.desktop +debian/tmp/usr/share/apps/konsole/shell.desktop +debian/tmp/usr/share/apps/konsole/solaris.keytab +debian/tmp/usr/share/apps/konsole/su.desktop +debian/tmp/usr/share/apps/konsole/sumc.desktop +debian/tmp/usr/share/apps/konsole/syscolor.schema +debian/tmp/usr/share/apps/konsole/tips +debian/tmp/usr/share/apps/konsole/Transparent_darkbg.schema +debian/tmp/usr/share/apps/konsole/Transparent_lightbg.schema +debian/tmp/usr/share/apps/konsole/Transparent_MC.schema +debian/tmp/usr/share/apps/konsole/Transparent.schema +debian/tmp/usr/share/apps/konsole/vim.schema +debian/tmp/usr/share/apps/konsole/vt100.keytab +debian/tmp/usr/share/apps/konsole/vt420pc.keytab +debian/tmp/usr/share/apps/konsole/wallpapers/Blkmarble.jpg +debian/tmp/usr/share/apps/konsole/wallpapers/gray02.jpg +debian/tmp/usr/share/apps/konsole/wallpapers/Metric-Monospace-14.png +debian/tmp/usr/share/apps/konsole/wallpapers/Paper01.jpg +debian/tmp/usr/share/apps/konsole/WhiteOnBlack.schema +debian/tmp/usr/share/apps/konsole/x11r5.keytab +debian/tmp/usr/share/apps/konsole/XTerm.schema +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmkonsole/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konsole/common +debian/tmp/usr/share/doc/kde/HTML/en/konsole/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/konsole/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konsole/konsole.png +debian/tmp/usr/share/doc/kde/HTML/en/konsole/tabbar.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/konsole.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/konsole.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/konsole.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/konsole.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/konsole.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/konsole.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/konsole.svgz +debian/tmp/usr/share/mimelnk/application/x-konsole.desktop +debian/tmp/usr/share/services/kded/kwrited.desktop +debian/tmp/usr/share/services/konsolepart.desktop +debian/tmp/usr/share/services/konsole-script.desktop +debian/tmp/usr/share/services/kwrited.desktop +debian/tmp/usr/share/servicetypes/terminalemulator.desktop + +debian/tmp/usr/share/apps/konsole/README.KeyTab /usr/share/doc/konsole +debian/tmp/usr/share/apps/konsole/README.Schema /usr/share/doc/konsole +debian/tmp/usr/share/apps/konsole/README.default.Keytab /usr/share/doc/konsole +debian/tmp/usr/share/apps/konsole/README.default.Schema /usr/share/doc/konsole + +debian/icons/konsole.xpm /usr/share/pixmaps +debian/icons/konsole-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kicker.install +++ kdebase-3.5.6/debian/kicker.install @@ -0,0 +1,284 @@ +debian/tmp/usr/bin/appletproxy +debian/tmp/usr/bin/extensionproxy +debian/tmp/usr/bin/kasbar +debian/tmp/usr/bin/kicker +debian/tmp/usr/lib/kconf_update_bin/kicker-3.4-reverseLayout +debian/tmp/usr/lib/kde3/appletproxy.la +debian/tmp/usr/lib/kde3/appletproxy.so +debian/tmp/usr/lib/kde3/clock_panelapplet.la +debian/tmp/usr/lib/kde3/clock_panelapplet.so +debian/tmp/usr/lib/kde3/dockbar_panelextension.la +debian/tmp/usr/lib/kde3/dockbar_panelextension.so +debian/tmp/usr/lib/kde3/extensionproxy.la +debian/tmp/usr/lib/kde3/extensionproxy.so +debian/tmp/usr/lib/kde3/kasbar_panelextension.la +debian/tmp/usr/lib/kde3/kasbar_panelextension.so +debian/tmp/usr/lib/kde3/kicker.la +debian/tmp/usr/lib/kde3/kickermenu_find.la +debian/tmp/usr/lib/kde3/kickermenu_find.so +debian/tmp/usr/lib/kde3/kickermenu_kate.la +debian/tmp/usr/lib/kde3/kickermenu_kate.so +debian/tmp/usr/lib/kde3/kickermenu_kdeprint.la +debian/tmp/usr/lib/kde3/kickermenu_kdeprint.so +debian/tmp/usr/lib/kde3/kickermenu_konqueror.la +debian/tmp/usr/lib/kde3/kickermenu_konqueror.so +debian/tmp/usr/lib/kde3/kickermenu_konsole.la +debian/tmp/usr/lib/kde3/kickermenu_konsole.so +debian/tmp/usr/lib/kde3/kickermenu_prefmenu.la +debian/tmp/usr/lib/kde3/kickermenu_prefmenu.so +debian/tmp/usr/lib/kde3/kickermenu_recentdocs.la +debian/tmp/usr/lib/kde3/kickermenu_recentdocs.so +debian/tmp/usr/lib/kde3/kickermenu_remotemenu.la +debian/tmp/usr/lib/kde3/kickermenu_remotemenu.so +debian/tmp/usr/lib/kde3/kickermenu_systemmenu.la +debian/tmp/usr/lib/kde3/kickermenu_systemmenu.so +debian/tmp/usr/lib/kde3/kicker.so +debian/tmp/usr/lib/kde3/launcher_panelapplet.la +debian/tmp/usr/lib/kde3/launcher_panelapplet.so +debian/tmp/usr/lib/kde3/lockout_panelapplet.la +debian/tmp/usr/lib/kde3/lockout_panelapplet.so +debian/tmp/usr/lib/kde3/media_panelapplet.la +debian/tmp/usr/lib/kde3/media_panelapplet.so +debian/tmp/usr/lib/kde3/menu_panelapplet.la +debian/tmp/usr/lib/kde3/menu_panelapplet.so +debian/tmp/usr/lib/kde3/minipager_panelapplet.la +debian/tmp/usr/lib/kde3/minipager_panelapplet.so +debian/tmp/usr/lib/kde3/naughty_panelapplet.la +debian/tmp/usr/lib/kde3/naughty_panelapplet.so +debian/tmp/usr/lib/kde3/run_panelapplet.la +debian/tmp/usr/lib/kde3/run_panelapplet.so +debian/tmp/usr/lib/kde3/sidebar_panelextension.la +debian/tmp/usr/lib/kde3/sidebar_panelextension.so +debian/tmp/usr/lib/kde3/systemtray_panelapplet.la +debian/tmp/usr/lib/kde3/systemtray_panelapplet.so +debian/tmp/usr/lib/kde3/taskbar_panelapplet.la +debian/tmp/usr/lib/kde3/taskbar_panelapplet.so +debian/tmp/usr/lib/kde3/taskbar_panelextension.la +debian/tmp/usr/lib/kde3/taskbar_panelextension.so +debian/tmp/usr/lib/kde3/trash_panelapplet.la +debian/tmp/usr/lib/kde3/trash_panelapplet.so +debian/tmp/usr/lib/libkasbar.so.1 +debian/tmp/usr/lib/libkasbar.so.1.0.0 +debian/tmp/usr/lib/libkdeinit_appletproxy.so +debian/tmp/usr/lib/libkdeinit_extensionproxy.so +debian/tmp/usr/lib/libkdeinit_kicker.so +debian/tmp/usr/lib/libkickermain.so.1 +debian/tmp/usr/lib/libkickermain.so.1.0.0 +debian/tmp/usr/lib/libtaskbar.so.1 +debian/tmp/usr/lib/libtaskbar.so.1.2.0 +debian/tmp/usr/lib/libtaskmanager.so.1 +debian/tmp/usr/lib/libtaskmanager.so.1.0.0 +debian/tmp/usr/share/applications/kde/kcmkicker.desktop +debian/tmp/usr/share/applnk/.hidden/kicker_config_arrangement.desktop +debian/tmp/usr/share/applnk/.hidden/kicker_config_hiding.desktop +debian/tmp/usr/share/applnk/.hidden/kicker_config_menus.desktop +debian/tmp/usr/share/apps/clockapplet/pics/lcd.png +debian/tmp/usr/share/apps/kconf_update/kicker-3.1-properSizeSetting.pl +debian/tmp/usr/share/apps/kconf_update/kicker-3.5-kconfigXTize.pl +debian/tmp/usr/share/apps/kconf_update/kicker-3.5-taskbarEnums.pl +debian/tmp/usr/share/apps/kconf_update/kickerrc.upd +debian/tmp/usr/share/apps/kicker/applets/clockapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/lockout.desktop +debian/tmp/usr/share/apps/kicker/applets/mediaapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/menuapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/minipagerapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/naughtyapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/quicklauncher.desktop +debian/tmp/usr/share/apps/kicker/applets/runapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/systemtrayapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/taskbarapplet.desktop +debian/tmp/usr/share/apps/kicker/applets/trashapplet.desktop +debian/tmp/usr/share/apps/kicker/builtins/bookmarks.desktop +debian/tmp/usr/share/apps/kicker/builtins/browser.desktop +debian/tmp/usr/share/apps/kicker/builtins/desktop.desktop +debian/tmp/usr/share/apps/kicker/builtins/exec.desktop +debian/tmp/usr/share/apps/kicker/builtins/kmenu.desktop +debian/tmp/usr/share/apps/kicker/builtins/windowlist.desktop +debian/tmp/usr/share/apps/kicker/default-apps +debian/tmp/usr/share/apps/kicker/extensions/childpanelextension.desktop +debian/tmp/usr/share/apps/kicker/extensions/dockbarextension.desktop +debian/tmp/usr/share/apps/kicker/extensions/kasbarextension.desktop +debian/tmp/usr/share/apps/kicker/extensions/sidebarextension.desktop +debian/tmp/usr/share/apps/kicker/extensions/taskbarextension.desktop +debian/tmp/usr/share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png +debian/tmp/usr/share/apps/kicker/icons/locolor/16x16/actions/modified.png +debian/tmp/usr/share/apps/kicker/menuext/find.desktop +debian/tmp/usr/share/apps/kicker/menuext/find/kfind.desktop +debian/tmp/usr/share/apps/kicker/menuext/find/websearch.desktop +debian/tmp/usr/share/apps/kicker/menuext/konquerormenu.desktop +debian/tmp/usr/share/apps/kicker/menuext/konsolemenu.desktop +debian/tmp/usr/share/apps/kicker/menuext/prefmenu.desktop +debian/tmp/usr/share/apps/kicker/menuext/printmenu.desktop +debian/tmp/usr/share/apps/kicker/menuext/recentdocs.desktop +debian/tmp/usr/share/apps/kicker/menuext/remotemenu.desktop +debian/tmp/usr/share/apps/kicker/menuext/systemmenu.desktop +debian/tmp/usr/share/apps/kicker/pics/disk10.png +debian/tmp/usr/share/apps/kicker/pics/disk1.png +debian/tmp/usr/share/apps/kicker/pics/disk2.png +debian/tmp/usr/share/apps/kicker/pics/disk3.png +debian/tmp/usr/share/apps/kicker/pics/disk4.png +debian/tmp/usr/share/apps/kicker/pics/disk5.png +debian/tmp/usr/share/apps/kicker/pics/disk6.png +debian/tmp/usr/share/apps/kicker/pics/disk7.png +debian/tmp/usr/share/apps/kicker/pics/disk8.png +debian/tmp/usr/share/apps/kicker/pics/disk9.png +debian/tmp/usr/share/apps/kicker/pics/kside.png +debian/tmp/usr/share/apps/kicker/pics/kside_tile.png +debian/tmp/usr/share/apps/kicker/tiles/blue_wood_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/blue_wood_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/blue_wood_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/blue_wood_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/blue_wood_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/blue_wood_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/green_wood_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/green_wood_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/green_wood_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/green_wood_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/green_wood_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/green_wood_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/KDE_button_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/KDE_button_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/KDE_button_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/KDE_button_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/KDE_button_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/KDE_button_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_gray_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_gray_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_gray_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_gray_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_gray_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_green_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_green_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_green_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_green_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_green_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_green_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_pastel_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_pastel_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_pastel_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_pastel_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_pastel_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_purple_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_purple_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_purple_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_purple_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/light_purple_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/light_purple_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/red_wood_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/red_wood_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/red_wood_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/red_wood_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/red_wood_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/red_wood_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_blue_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_blue_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_blue_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_blue_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_blue_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_blue_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_gray_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_gray_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_gray_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_gray_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_gray_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_gray_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_green_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_green_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_green_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_green_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_green_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_green_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_orange_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_orange_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_orange_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_orange_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_orange_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_orange_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_purple_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_purple_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_purple_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_purple_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_purple_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_purple_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_red_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_red_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_red_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_red_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_red_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_red_tiny_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_large_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_large_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_normal_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_normal_up.png +debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_tiny_down.png +debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_tiny_up.png +debian/tmp/usr/share/apps/kicker/wallpapers/deck_plate.png +debian/tmp/usr/share/apps/kicker/wallpapers/default.png +debian/tmp/usr/share/apps/kicker/wallpapers/green_line.png +debian/tmp/usr/share/apps/kicker/wallpapers/rail.png +debian/tmp/usr/share/apps/naughtyapplet/pics/naughty-happy.png +debian/tmp/usr/share/apps/naughtyapplet/pics/naughty-sad.png +debian/tmp/usr/share/autostart/panel.desktop +debian/tmp/usr/share/config.kcfg/kickerSettings.kcfg +debian/tmp/usr/share/config.kcfg/launcherapplet.kcfg +debian/tmp/usr/share/config.kcfg/taskbar.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kicker/bookmarks_icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/common +debian/tmp/usr/share/doc/kde/HTML/en/kicker/desktop_icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kicker/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kicker/k_menu_icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/man-appletproxy.1.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kicker/man-kicker.1.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kicker/printsys_icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/quickbrowser_icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/recent_docs_icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/screenshot_left.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/screenshot_right.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/taskbar_group.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/terminals_icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kicker/windowlist_icon.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/systemtray.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/taskbar.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kbinaryclock.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kdisknav.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kicker.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/panel.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/runprocesscatcher.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/systemtray.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/taskbar.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/window_list.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kbinaryclock.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/runprocesscatcher.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/systemtray.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/taskbar.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kbinaryclock.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kdisknav.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/runprocesscatcher.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/systemtray.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/taskbar.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/window_list.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kbinaryclock.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kdisknav.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/systemtray.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/taskbar.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/window_list.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/systemtray.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/taskbar.png +debian/tmp/usr/share/icons/crystalsvg/scalable/apps/kbinaryclock.svgz +debian/tmp/usr/share/icons/crystalsvg/scalable/apps/systemtray.svgz +debian/tmp/usr/share/apps/kicker/menuext/katesessionmenu.desktop + +debian/icons/kicker.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kdeprint.menu +++ kdebase-3.5.6/debian/kdeprint.menu @@ -0,0 +1,35 @@ +?package(kdeprint):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KJobViewer"\ + icon32x32="/usr/share/pixmaps/kjobviewer.xpm"\ + icon16x16="/usr/share/pixmaps/kjobviewer-16.xpm"\ + command="/usr/bin/kjobviewer --show --all" + +?package(kdeprint):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KPrinter"\ + icon32x32="/usr/share/pixmaps/kdeprint.xpm"\ + icon16x16="/usr/share/pixmaps/kdeprint-16.xpm"\ + command="/usr/bin/kprinter" + +?package(kdeprint):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KDEPrintFax"\ + icon32x32="/usr/share/pixmaps/kdeprintfax.xpm"\ + icon16x16="/usr/share/pixmaps/kdeprintfax-16.xpm"\ + command="/usr/bin/kdeprintfax" + +# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm +# Icon 16x16 kdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm + +# Icon 32x32 kdeprint/printmgr/cr32-app-printmgr.png kdeprint.xpm +# Icon 16x16 kdeprint/printmgr/cr16-app-printmgr.png kdeprint-16.xpm + +# Icon 32x32 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm +# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-16.xpm --- kdebase-3.5.6.orig/debian/kicker.lintian +++ kdebase-3.5.6/debian/kicker.lintian @@ -0,0 +1,3 @@ +kicker: shlib-missing-in-control-file libkdeinit_extensionproxy.so usr/lib/libkdeinit_extensionproxy.so +kicker: shlib-missing-in-control-file libkdeinit_kicker.so usr/lib/libkdeinit_kicker.so +kicker: shlib-missing-in-control-file libkdeinit_appletproxy.so usr/lib/libkdeinit_appletproxy.so --- kdebase-3.5.6.orig/debian/kdebase-kio-plugins.manpages +++ kdebase-3.5.6/debian/kdebase-kio-plugins.manpages @@ -0,0 +1,2 @@ +debian/man/kio_media_mounthelper.1 +debian/man/ktrash.1 --- kdebase-3.5.6.orig/debian/kdm.logrotate +++ kdebase-3.5.6/debian/kdm.logrotate @@ -0,0 +1,9 @@ +/var/log/kdm.log { + rotate 7 + daily + compress + delaycompress + copytruncate + missingok + notifempty +} --- kdebase-3.5.6.orig/debian/konsole.README.Debian +++ kdebase-3.5.6/debian/konsole.README.Debian @@ -0,0 +1,16 @@ +Installing konsole's bitmap fonts +================================= + +Formerly, the few bitmap fonts KDE included, designed for use with Konsole, +were shipped as part of the xfonts-konsole package. However, as Konsole no +longer uses these fonts by default, and most users no longer use bitmap +fonts at all, KDE now includes these fonts with Konsole itself, and Debian +has followed this practice, including the fonts in the konsole package, and +eliminating the xfonts-konsole package entirely. + +To make use of these legacy fonts, start Konsole, and under Settings --> Font +select "Install Bitmap...". This will allow you to copy the legacy Konsole +fonts to $HOME/.fonts, where, after restarting KDE, all applications run by +that user, including Konsole, will be able to find them. Also make sure that +fontconfig is configured to allow the use of bitmap fonts. If you're not sure, +run, as root, 'dpkg-reconfigure fontconfig' from Konsole. --- kdebase-3.5.6.orig/debian/kmenuedit.lintian +++ kdebase-3.5.6/debian/kmenuedit.lintian @@ -0,0 +1,4 @@ +kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kcontroledit.so +kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kmenuedit.so +kmenuedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kcontroledit.so +kmenuedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kcontroledit.so --- kdebase-3.5.6.orig/debian/kcontrol.install +++ kdebase-3.5.6/debian/kcontrol.install @@ -0,0 +1,238 @@ +debian/tmp/usr/bin/kaccess +debian/tmp/usr/bin/kcontrol +debian/tmp/usr/bin/kdeinstallktheme +debian/tmp/usr/bin/keditfiletype +debian/tmp/usr/bin/kfontinst +debian/tmp/usr/bin/kfontview +debian/tmp/usr/bin/kinfocenter +debian/tmp/usr/bin/klocaldomainurifilterhelper +debian/tmp/usr/bin/krandrtray +debian/tmp/usr/bin/krdb +debian/tmp/usr/lib/kde3/fontthumbnail.la +debian/tmp/usr/lib/kde3/fontthumbnail.so +debian/tmp/usr/lib/kde3/kaccess.la +debian/tmp/usr/lib/kde3/kaccess.so +debian/tmp/usr/lib/kde3/kcm_access.la +debian/tmp/usr/lib/kde3/kcm_access.so +debian/tmp/usr/lib/kde3/kcm_arts.la +debian/tmp/usr/lib/kde3/kcm_arts.so +debian/tmp/usr/lib/kde3/kcm_background.la +debian/tmp/usr/lib/kde3/kcm_background.so +debian/tmp/usr/lib/kde3/kcm_bell.la +debian/tmp/usr/lib/kde3/kcm_bell.so +debian/tmp/usr/lib/kde3/kcm_clock.la +debian/tmp/usr/lib/kde3/kcm_clock.so +debian/tmp/usr/lib/kde3/kcm_colors.la +debian/tmp/usr/lib/kde3/kcm_colors.so +debian/tmp/usr/lib/kde3/kcm_componentchooser.la +debian/tmp/usr/lib/kde3/kcm_componentchooser.so +debian/tmp/usr/lib/kde3/kcm_crypto.la +debian/tmp/usr/lib/kde3/kcm_crypto.so +debian/tmp/usr/lib/kde3/kcm_css.la +debian/tmp/usr/lib/kde3/kcm_css.so +debian/tmp/usr/lib/kde3/kcm_display.la +debian/tmp/usr/lib/kde3/kcm_display.so +debian/tmp/usr/lib/kde3/kcm_energy.la +debian/tmp/usr/lib/kde3/kcm_energy.so +debian/tmp/usr/lib/kde3/kcm_filetypes.la +debian/tmp/usr/lib/kde3/kcm_filetypes.so +debian/tmp/usr/lib/kde3/kcm_fontinst.la +debian/tmp/usr/lib/kde3/kcm_fontinst.so +debian/tmp/usr/lib/kde3/kcm_fonts.la +debian/tmp/usr/lib/kde3/kcm_fonts.so +debian/tmp/usr/lib/kde3/kcm_icons.la +debian/tmp/usr/lib/kde3/kcm_icons.so +debian/tmp/usr/lib/kde3/kcm_info.la +debian/tmp/usr/lib/kde3/kcm_info.so +debian/tmp/usr/lib/kde3/kcm_input.la +debian/tmp/usr/lib/kde3/kcm_input.so +debian/tmp/usr/lib/kde3/kcm_ioslaveinfo.la +debian/tmp/usr/lib/kde3/kcm_ioslaveinfo.so +debian/tmp/usr/lib/kde3/kcm_joystick.la +debian/tmp/usr/lib/kde3/kcm_joystick.so +debian/tmp/usr/lib/kde3/kcm_kded.la +debian/tmp/usr/lib/kde3/kcm_kded.so +debian/tmp/usr/lib/kde3/kcm_kdm.la +debian/tmp/usr/lib/kde3/kcm_kdm.so +debian/tmp/usr/lib/kde3/kcm_kdnssd.so +debian/tmp/usr/lib/kde3/kcm_kdnssd.la +debian/tmp/usr/lib/kde3/kcm_keys.la +debian/tmp/usr/lib/kde3/kcm_keys.so +debian/tmp/usr/lib/kde3/kcm_kicker.la +debian/tmp/usr/lib/kde3/kcm_kicker.so +debian/tmp/usr/lib/kde3/kcm_kio.la +debian/tmp/usr/lib/kde3/kcm_kio.so +debian/tmp/usr/lib/kde3/kcm_knotify.la +debian/tmp/usr/lib/kde3/kcm_knotify.so +debian/tmp/usr/lib/kde3/kcm_konqhtml.la +debian/tmp/usr/lib/kde3/kcm_konqhtml.so +debian/tmp/usr/lib/kde3/kcm_konq.la +debian/tmp/usr/lib/kde3/kcm_konq.so +debian/tmp/usr/lib/kde3/kcm_kthememanager.la +debian/tmp/usr/lib/kde3/kcm_kthememanager.so +debian/tmp/usr/lib/kde3/kcm_kurifilt.la +debian/tmp/usr/lib/kde3/kcm_kurifilt.so +debian/tmp/usr/lib/kde3/kcm_launch.la +debian/tmp/usr/lib/kde3/kcm_launch.so +debian/tmp/usr/lib/kde3/kcm_locale.la +debian/tmp/usr/lib/kde3/kcm_locale.so +debian/tmp/usr/lib/kde3/kcm_nic.la +debian/tmp/usr/lib/kde3/kcm_nic.so +debian/tmp/usr/lib/kde3/kcm_performance.la +debian/tmp/usr/lib/kde3/kcm_performance.so +debian/tmp/usr/lib/kde3/kcm_privacy.la +debian/tmp/usr/lib/kde3/kcm_privacy.so +debian/tmp/usr/lib/kde3/kcm_randr.la +debian/tmp/usr/lib/kde3/kcm_randr.so +debian/tmp/usr/lib/kde3/kcm_samba.la +debian/tmp/usr/lib/kde3/kcm_samba.so +debian/tmp/usr/lib/kde3/kcm_screensaver.la +debian/tmp/usr/lib/kde3/kcm_screensaver.so +debian/tmp/usr/lib/kde3/kcm_smserver.la +debian/tmp/usr/lib/kde3/kcm_smserver.so +debian/tmp/usr/lib/kde3/kcm_spellchecking.la +debian/tmp/usr/lib/kde3/kcm_spellchecking.so +debian/tmp/usr/lib/kde3/kcm_style.la +debian/tmp/usr/lib/kde3/kcm_style.so +debian/tmp/usr/lib/kde3/kcm_taskbar.la +debian/tmp/usr/lib/kde3/kcm_taskbar.so +debian/tmp/usr/lib/kde3/kcm_usb.la +debian/tmp/usr/lib/kde3/kcm_usb.so +debian/tmp/usr/lib/kde3/kcm_view1394.la +debian/tmp/usr/lib/kde3/kcm_view1394.so +debian/tmp/usr/lib/kde3/kcm_xinerama.la +debian/tmp/usr/lib/kde3/kcm_xinerama.so +debian/tmp/usr/lib/kde3/kcontrol.la +debian/tmp/usr/lib/kde3/kcontrol.so +debian/tmp/usr/lib/kde3/kfile_font.la +debian/tmp/usr/lib/kde3/kfile_font.so +debian/tmp/usr/lib/kde3/kio_fonts.la +debian/tmp/usr/lib/kde3/kio_fonts.so +debian/tmp/usr/lib/kde3/kstyle_keramik_config.la +debian/tmp/usr/lib/kde3/kstyle_keramik_config.so +debian/tmp/usr/lib/kde3/libkfontviewpart.la +debian/tmp/usr/lib/kde3/libkfontviewpart.so +debian/tmp/usr/lib/kde3/libkshorturifilter.la +debian/tmp/usr/lib/kde3/libkshorturifilter.so +debian/tmp/usr/lib/kde3/libkuriikwsfilter.la +debian/tmp/usr/lib/kde3/libkuriikwsfilter.so +debian/tmp/usr/lib/kde3/libkurisearchfilter.la +debian/tmp/usr/lib/kde3/libkurisearchfilter.so +debian/tmp/usr/lib/kde3/liblocaldomainurifilter.la +debian/tmp/usr/lib/kde3/liblocaldomainurifilter.so +debian/tmp/usr/lib/libkdeinit_kaccess.so +debian/tmp/usr/lib/libkdeinit_kcontrol.so +debian/tmp/usr/lib/libkfontinst.so.0 +debian/tmp/usr/lib/libkfontinst.so.0.0.0 +debian/tmp/usr/share/applications/kde/arts.desktop +debian/tmp/usr/share/applications/kde/background.desktop +debian/tmp/usr/share/applications/kde/bell.desktop +debian/tmp/usr/share/applications/kde/cache.desktop +debian/tmp/usr/share/applications/kde/cdinfo.desktop +debian/tmp/usr/share/applications/kde/clock.desktop +debian/tmp/usr/share/applications/kde/colors.desktop +debian/tmp/usr/share/applications/kde/componentchooser.desktop +debian/tmp/usr/share/applications/kde/cookies.desktop +debian/tmp/usr/share/applications/kde/crypto.desktop +debian/tmp/usr/share/applications/kde/desktopbehavior.desktop +debian/tmp/usr/share/applications/kde/desktop.desktop +debian/tmp/usr/share/applications/kde/desktoppath.desktop +debian/tmp/usr/share/applications/kde/devices.desktop +debian/tmp/usr/share/applications/kde/display.desktop +debian/tmp/usr/share/applications/kde/dma.desktop +debian/tmp/usr/share/applications/kde/ebrowsing.desktop +debian/tmp/usr/share/applications/kde/filebrowser.desktop +debian/tmp/usr/share/applications/kde/filetypes.desktop +debian/tmp/usr/share/applications/kde/fonts.desktop +debian/tmp/usr/share/applications/kde/icons.desktop +debian/tmp/usr/share/applications/kde/installktheme.desktop +debian/tmp/usr/share/applications/kde/interrupts.desktop +debian/tmp/usr/share/applications/kde/ioports.desktop +debian/tmp/usr/share/applications/kde/ioslaveinfo.desktop +debian/tmp/usr/share/applications/kde/joystick.desktop +debian/tmp/usr/share/applications/kde/kcm_kdnssd.desktop +debian/tmp/usr/share/applications/kde/kcmaccess.desktop +debian/tmp/usr/share/applications/kde/kcmcss.desktop +debian/tmp/usr/share/applications/kde/kcmfontinst.desktop +debian/tmp/usr/share/applications/kde/kcmkded.desktop +debian/tmp/usr/share/applications/kde/kcmlaunch.desktop +debian/tmp/usr/share/applications/kde/kcmnotify.desktop +debian/tmp/usr/share/applications/kde/kcmperformance.desktop +debian/tmp/usr/share/applications/kde/kcmsmserver.desktop +debian/tmp/usr/share/applications/kde/kcmtaskbar.desktop +debian/tmp/usr/share/applications/kde/kcmusb.desktop +debian/tmp/usr/share/applications/kde/kcmview1394.desktop +debian/tmp/usr/share/applications/kde/KControl.desktop +debian/tmp/usr/share/applications/kde/kdm.desktop +debian/tmp/usr/share/applications/kde/keys.desktop +debian/tmp/usr/share/applications/kde/kfontview.desktop +debian/tmp/usr/share/applications/kde/khtml_behavior.desktop +debian/tmp/usr/share/applications/kde/khtml_fonts.desktop +debian/tmp/usr/share/applications/kde/khtml_java_js.desktop +debian/tmp/usr/share/applications/kde/kinfocenter.desktop +debian/tmp/usr/share/applications/kde/krandrtray.desktop +debian/tmp/usr/share/applications/kde/kthememanager.desktop +debian/tmp/usr/share/applications/kde/lanbrowser.desktop +debian/tmp/usr/share/applications/kde/language.desktop +debian/tmp/usr/share/applications/kde/media.desktop +debian/tmp/usr/share/applications/kde/memory.desktop +debian/tmp/usr/share/applications/kde/mouse.desktop +debian/tmp/usr/share/applications/kde/netpref.desktop +debian/tmp/usr/share/applications/kde/nic.desktop +debian/tmp/usr/share/applications/kde/opengl.desktop +debian/tmp/usr/share/applications/kde/panel_appearance.desktop +debian/tmp/usr/share/applications/kde/panel.desktop +debian/tmp/usr/share/applications/kde/partitions.desktop +debian/tmp/usr/share/applications/kde/pci.desktop +debian/tmp/usr/share/applications/kde/privacy.desktop +debian/tmp/usr/share/applications/kde/processor.desktop +debian/tmp/usr/share/applications/kde/proxy.desktop +debian/tmp/usr/share/applications/kde/screensaver.desktop +debian/tmp/usr/share/applications/kde/scsi.desktop +debian/tmp/usr/share/applications/kde/smbstatus.desktop +debian/tmp/usr/share/applications/kde/sound.desktop +debian/tmp/usr/share/applications/kde/spellchecking.desktop +debian/tmp/usr/share/applications/kde/style.desktop +debian/tmp/usr/share/applications/kde/useragent.desktop +debian/tmp/usr/share/applications/kde/xserver.desktop +debian/tmp/usr/share/applnk/.hidden/energy.desktop +debian/tmp/usr/share/applnk/.hidden/fileappearance.desktop +debian/tmp/usr/share/applnk/.hidden/filebehavior.desktop +debian/tmp/usr/share/applnk/.hidden/filepreviews.desktop +debian/tmp/usr/share/applnk/.hidden/kcmkonqyperformance.desktop +debian/tmp/usr/share/applnk/.hidden/kicker_config_appearance.desktop +debian/tmp/usr/share/applnk/.hidden/kicker_config.desktop +debian/tmp/usr/share/applnk/.hidden/randr.desktop +debian/tmp/usr/share/applnk/.hidden/smb.desktop +debian/tmp/usr/share/applnk/.hidden/xinerama.desktop +debian/tmp/usr/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop +debian/tmp/usr/share/applnk/Settings/LookNFeel/panel_appearance.desktop +debian/tmp/usr/share/applnk/Settings/LookNFeel/panel.desktop +debian/tmp/usr/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop +debian/tmp/usr/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop +debian/tmp/usr/share/applnk/Settings/WebBrowsing/nsplugin.desktop +debian/tmp/usr/share/applnk/Settings/WebBrowsing/smb.desktop +debian/tmp/usr/share/apps/kcm_componentchooser/kcm_browser.desktop +debian/tmp/usr/share/apps/kcm_componentchooser/kcm_kemail.desktop +debian/tmp/usr/share/apps/kcm_componentchooser/kcm_terminal.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/fonts.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/installfont.desktop +debian/tmp/usr/share/locale/en_US/entry.desktop +debian/tmp/usr/share/mimelnk/application/x-ktheme.desktop +debian/tmp/usr/share/mimelnk/fonts/folder.desktop +debian/tmp/usr/share/mimelnk/fonts/package.desktop +debian/tmp/usr/share/mimelnk/fonts/system-folder.desktop +debian/tmp/usr/share/services/fonts.protocol +debian/tmp/usr/share/services/fontthumbnail.desktop +debian/tmp/usr/share/services/kaccess.desktop +debian/tmp/usr/share/services/kfile_font.desktop +debian/tmp/usr/share/services/kfontviewpart.desktop +debian/tmp/usr/share/services/kshorturifilter.desktop +debian/tmp/usr/share/services/kuriikwsfilter.desktop +debian/tmp/usr/share/services/kurisearchfilter.desktop +debian/tmp/usr/share/services/localdomainurifilter.desktop + +debian/icons/kcontrol.xpm /usr/share/pixmaps +debian/icons/kcontrol-16.xpm /usr/share/pixmaps +debian/icons/kinfocenter.xpm /usr/share/pixmaps +debian/icons/kinfocenter-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kscreensaver.pam +++ kdebase-3.5.6/debian/kscreensaver.pam @@ -0,0 +1,7 @@ +# +# /etc/pam.d/kscreensaver - specify the PAM behaviour of kscreensaver +# +@include common-auth +@include common-account +@include common-password +@include common-session --- kdebase-3.5.6.orig/debian/kdebase-bin.links +++ kdebase-3.5.6/debian/kdebase-bin.links @@ -0,0 +1 @@ +usr/share/man/man1/kdesu.1.gz usr/share/man/man1/kdesud.1.gz --- kdebase-3.5.6.orig/debian/kicker.preinst +++ kdebase-3.5.6/debian/kicker.preinst @@ -0,0 +1,26 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/menu-methods/kdebase + rm -f /etc/kde3/debian/kde-update-menu.sh + rm -f /etc/menu-methods/kicker + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/kfind.manpages +++ kdebase-3.5.6/debian/kfind.manpages @@ -0,0 +1 @@ +debian/man/kfind.1 --- kdebase-3.5.6.orig/debian/konqueror-nsplugins.install +++ kdebase-3.5.6/debian/konqueror-nsplugins.install @@ -0,0 +1,8 @@ +debian/tmp/usr/bin/nspluginscan +debian/tmp/usr/bin/nspluginviewer +debian/tmp/usr/lib/kde3/kcm_nsplugins.la +debian/tmp/usr/lib/kde3/kcm_nsplugins.so +debian/tmp/usr/lib/kde3/libnsplugin.la +debian/tmp/usr/lib/kde3/libnsplugin.so +debian/tmp/usr/share/applications/kde/khtml_plugins.desktop +debian/tmp/usr/share/apps/plugin/nspluginpart.rc --- kdebase-3.5.6.orig/debian/ksmserver.lintian +++ kdebase-3.5.6/debian/ksmserver.lintian @@ -0,0 +1,2 @@ +ksmserver: no-shlibs-control-file usr/lib/libkdeinit_ksmserver.so +ksmserver: postinst-must-call-ldconfig usr/lib/libkdeinit_ksmserver.so --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.konsole +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.konsole @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-konsole +Title: Konsole Handbook +Author: Jonathan Singer, Kurt Hindenburg +Abstract: Konsole is an X terminal emulator for KDE. +Section: Xshells + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/konsole/index.html +Files: /usr/share/doc/kde/HTML/en/konsole/*.html + --- kdebase-3.5.6.orig/debian/kpager.menu +++ kdebase-3.5.6/debian/kpager.menu @@ -0,0 +1,11 @@ +?package(kpager):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="KPager"\ + icon32x32="/usr/share/pixmaps/kpager.xpm"\ + icon16x16="/usr/share/pixmaps/kpager-16.xpm"\ + command="/usr/bin/kpager" + +# Icon 32x32 kpager/cr32-app-kpager.png kpager.xpm +# Icon 16x16 kpager/cr16-app-kpager.png kpager-16.xpm --- kdebase-3.5.6.orig/debian/konqueror.postinst +++ kdebase-3.5.6/debian/konqueror.postinst @@ -0,0 +1,20 @@ +#! /bin/sh -e + +case "$1" in + configure) + update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/konqueror 100 \ + --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz "/usr/share/man/man1/konqueror.1.gz" + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.kdm +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.kdm @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-kdm +Title: KDM Handbook +Author: Oswald Buddenhagen +Abstract: This document describes KDM, the KDE Display Manager, an X session manager. +Section: System + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kdm/index.html +Files: /usr/share/doc/kde/HTML/en/kdm/*.html + --- kdebase-3.5.6.orig/debian/konqueror.docs +++ kdebase-3.5.6/debian/konqueror.docs @@ -0,0 +1 @@ +libkonq/SERVICEMENUS --- kdebase-3.5.6.orig/debian/usermap.pl +++ kdebase-3.5.6/debian/usermap.pl @@ -0,0 +1,59 @@ +#!/usr/bin/perl + +# Copyright (C) 2005 Mandriva +# Olivier Blin +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +my %flags = ( + idVendor => 0x0001, + idProduct => 0x0002, +); + +sub parse_usermap_line { + local $_ = shift; + /^#/ and next; + my %match; + @match{module, match_flags, idVendor, idProduct} = + /^(\S+)\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})(?:\s+0x(\w{2,}))?/ + or die qq(unable to parse line "$_"); + $match{match_flags} = hex($match{match_flags}); + $match{driver_info} ||= 0; + + my @rule; + while (my ($key, $flag) = each(%flags)) { + hex($match{match_flags}) & $flag and push @rule, qq(SYSFS{$key}=="$match{$key}",); + } + push @rule, + ( + qq(MODE="660",), + ); + push @rule, + ( + qq(GROUP="plugdev"), + ); + print join(' ', @rule) . "\n"; +} + +print "BUS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n"; +print "ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n"; +print "SUBSYSTEM!=\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n"; + +foreach my $usermap (@ARGV) { + open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap"; + parse_usermap_line($_) foreach <$IN>; +} + +print "\nLABEL=\"kcontrol_rules_end\"\n"; --- kdebase-3.5.6.orig/debian/kate.menu +++ kdebase-3.5.6/debian/kate.menu @@ -0,0 +1,23 @@ +?package(kate):\ + needs="X11"\ + section="Apps/Editors"\ + hints="KDE,Text"\ + title="Kate"\ + icon32x32="/usr/share/pixmaps/kate.xpm"\ + icon16x16="/usr/share/pixmaps/kate-16.xpm"\ + command="/usr/bin/kate" + +?package(kate):\ + needs="X11"\ + section="Apps/Editors"\ + hints="KDE,Text"\ + title="KWrite"\ + icon32x32="/usr/share/pixmaps/kwrite.xpm"\ + icon16x16="/usr/share/pixmaps/kwrite-16.xpm"\ + command="/usr/bin/kwrite" + +# Icon 32x32 kate/pics/cr32-app-kate.png kate.xpm +# Icon 16x16 kate/pics/cr16-app-kate.png kate-16.xpm + +# Icon 32x32 kate/pics/cr32-app-kwrite.png kwrite.xpm +# Icon 16x16 kate/pics/cr16-app-kwrite.png kwrite-16.xpm --- kdebase-3.5.6.orig/debian/kwin.install +++ kdebase-3.5.6/debian/kwin.install @@ -0,0 +1,101 @@ +debian/tmp/usr/bin/kompmgr +debian/tmp/usr/bin/kwin +debian/tmp/usr/bin/kwin_killer_helper +debian/tmp/usr/bin/kwin_rules_dialog +debian/tmp/usr/lib/kconf_update_bin/kwin_update_default_rules +debian/tmp/usr/lib/kconf_update_bin/kwin_update_window_settings +debian/tmp/usr/lib/kde3/kcm_kwindecoration.la +debian/tmp/usr/lib/kde3/kcm_kwindecoration.so +debian/tmp/usr/lib/kde3/kcm_kwinoptions.la +debian/tmp/usr/lib/kde3/kcm_kwinoptions.so +debian/tmp/usr/lib/kde3/kcm_kwinrules.la +debian/tmp/usr/lib/kde3/kcm_kwinrules.so +debian/tmp/usr/lib/kde3/kwin3_b2.la +debian/tmp/usr/lib/kde3/kwin3_b2.so +debian/tmp/usr/lib/kde3/kwin3_default.la +debian/tmp/usr/lib/kde3/kwin3_default.so +debian/tmp/usr/lib/kde3/kwin3_keramik.la +debian/tmp/usr/lib/kde3/kwin3_keramik.so +debian/tmp/usr/lib/kde3/kwin3_laptop.la +debian/tmp/usr/lib/kde3/kwin3_laptop.so +debian/tmp/usr/lib/kde3/kwin3_modernsys.la +debian/tmp/usr/lib/kde3/kwin3_modernsys.so +debian/tmp/usr/lib/kde3/kwin3_plastik.la +debian/tmp/usr/lib/kde3/kwin3_plastik.so +debian/tmp/usr/lib/kde3/kwin3_quartz.la +debian/tmp/usr/lib/kde3/kwin3_quartz.so +debian/tmp/usr/lib/kde3/kwin3_redmond.la +debian/tmp/usr/lib/kde3/kwin3_redmond.so +debian/tmp/usr/lib/kde3/kwin3_web.la +debian/tmp/usr/lib/kde3/kwin3_web.so +debian/tmp/usr/lib/kde3/kwin_b2_config.la +debian/tmp/usr/lib/kde3/kwin_b2_config.so +debian/tmp/usr/lib/kde3/kwin_default_config.la +debian/tmp/usr/lib/kde3/kwin_default_config.so +debian/tmp/usr/lib/kde3/kwin_keramik_config.la +debian/tmp/usr/lib/kde3/kwin_keramik_config.so +debian/tmp/usr/lib/kde3/kwin.la +debian/tmp/usr/lib/kde3/kwin_modernsys_config.la +debian/tmp/usr/lib/kde3/kwin_modernsys_config.so +debian/tmp/usr/lib/kde3/kwin_plastik_config.la +debian/tmp/usr/lib/kde3/kwin_plastik_config.so +debian/tmp/usr/lib/kde3/kwin_quartz_config.la +debian/tmp/usr/lib/kde3/kwin_quartz_config.so +debian/tmp/usr/lib/kde3/kwin_rules_dialog.la +debian/tmp/usr/lib/kde3/kwin_rules_dialog.so +debian/tmp/usr/lib/kde3/kwin.so +debian/tmp/usr/lib/libkdecorations.so.1 +debian/tmp/usr/lib/libkdecorations.so.1.0.0 +debian/tmp/usr/lib/libkdeinit_kwin_rules_dialog.so +debian/tmp/usr/lib/libkdeinit_kwin.so +debian/tmp/usr/share/applications/kde/kwindecoration.desktop +debian/tmp/usr/share/applications/kde/kwinoptions.desktop +debian/tmp/usr/share/applications/kde/kwinrules.desktop +debian/tmp/usr/share/applnk/.hidden/kwinactions.desktop +debian/tmp/usr/share/applnk/.hidden/kwinadvanced.desktop +debian/tmp/usr/share/applnk/.hidden/kwinfocus.desktop +debian/tmp/usr/share/applnk/.hidden/kwinmoving.desktop +debian/tmp/usr/share/applnk/.hidden/kwintranslucency.desktop +debian/tmp/usr/share/apps/kconf_update/kwin3_plugin.pl +debian/tmp/usr/share/apps/kconf_update/kwin3_plugin.upd +debian/tmp/usr/share/apps/kconf_update/kwin_focus1.sh +debian/tmp/usr/share/apps/kconf_update/kwin_focus1.upd +debian/tmp/usr/share/apps/kconf_update/kwin_focus2.sh +debian/tmp/usr/share/apps/kconf_update/kwin_focus2.upd +debian/tmp/usr/share/apps/kconf_update/kwin_fsp_workarounds_1.upd +debian/tmp/usr/share/apps/kconf_update/kwiniconify.upd +debian/tmp/usr/share/apps/kconf_update/kwinsticky.upd +debian/tmp/usr/share/apps/kconf_update/kwin.upd +debian/tmp/usr/share/apps/kconf_update/kwinupdatewindowsettings.upd +debian/tmp/usr/share/apps/kconf_update/pluginlibFix.pl +debian/tmp/usr/share/apps/kwin/b2.desktop +debian/tmp/usr/share/apps/kwin/eventsrc +debian/tmp/usr/share/apps/kwin/keramik.desktop +debian/tmp/usr/share/apps/kwin/laptop.desktop +debian/tmp/usr/share/apps/kwin/modernsystem.desktop +debian/tmp/usr/share/apps/kwin/default_rules/fsp_workarounds_1 +debian/tmp/usr/share/apps/kwin/pics/bluesun.png +debian/tmp/usr/share/apps/kwin/pics/close.png +debian/tmp/usr/share/apps/kwin/pics/fog-grey.png +debian/tmp/usr/share/apps/kwin/pics/fog.png +debian/tmp/usr/share/apps/kwin/pics/greenie.dim.png +debian/tmp/usr/share/apps/kwin/pics/greenie.light.png +debian/tmp/usr/share/apps/kwin/pics/iconify.png +debian/tmp/usr/share/apps/kwin/pics/maximizedown.png +debian/tmp/usr/share/apps/kwin/pics/maximize.png +debian/tmp/usr/share/apps/kwin/pics/menu.png +debian/tmp/usr/share/apps/kwin/pics/pindown.png +debian/tmp/usr/share/apps/kwin/pics/pinup.png +debian/tmp/usr/share/apps/kwin/pics/unknown.png +debian/tmp/usr/share/apps/kwin/plastik.desktop +debian/tmp/usr/share/apps/kwin/quartz.desktop +debian/tmp/usr/share/apps/kwin/redmond.desktop +debian/tmp/usr/share/apps/kwin/web.desktop +debian/tmp/usr/share/config.kcfg/kwin.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kompmgr/common +debian/tmp/usr/share/doc/kde/HTML/en/kompmgr/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kompmgr/index.docbook +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kwin.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kwin.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kwin.png +debian/tmp/usr/share/sounds/pop.wav --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.konqueror +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.konqueror @@ -0,0 +1,11 @@ +Document: kdebase-doc-html-konqueror +Title: Konqueror Handbook +Author: Pamela Roberts +Abstract: Konqueror is KDE's advanced File Manager, Web Browser and + Universal Viewing Application. +Section: Apps/Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/konqueror/index.html +Files: /usr/share/doc/kde/HTML/en/konqueror/*.html + --- kdebase-3.5.6.orig/debian/patches/12_genkdm_make.diff +++ kdebase-3.5.6/debian/patches/12_genkdm_make.diff @@ -0,0 +1,9 @@ +--- kde.orig/kdm/kfrontend/Makefile.am ++++ kde.patched/kdm/kfrontend/Makefile.am +@@ -1,5 +1,5 @@ + # use 'make GENKDMCONF_FLAGS=... install' to override +-GENKDMCONF_FLAGS = ++GENKDMCONF_FLAGS = --no-old + + SUBDIRS = themer themes pics sessions + --- kdebase-3.5.6.orig/debian/patches/kubuntu_04_hide_menu_entries.diff +++ kdebase-3.5.6/debian/patches/kubuntu_04_hide_menu_entries.diff @@ -0,0 +1,7 @@ +--- kdebase/kate/data/kwrite.desktop 2005-03-17 02:30:43.361137168 +0000 ++++ kdebase/kate/data/kwrite.desktop 2005-03-17 02:30:51.972827992 +0000 +@@ -103,3 +103,4 @@ + InitialPreference=8 + X-DCOP-ServiceType=Multi + Categories=Qt;KDE;TextEditor; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_33_kubuntuify_about.diff +++ kdebase-3.5.6/debian/patches/kubuntu_33_kubuntuify_about.diff @@ -0,0 +1,41 @@ +diff -Nur kdebase-3.5.6/konqueror/about/konq_aboutpage.cc kdebase-3.5.6.new/konqueror/about/konq_aboutpage.cc +--- kdebase-3.5.6/konqueror/about/konq_aboutpage.cc 2007-03-12 16:34:28.000000000 +0000 ++++ kdebase-3.5.6.new/konqueror/about/konq_aboutpage.cc 2007-03-12 16:40:20.000000000 +0000 +@@ -106,6 +106,7 @@ + QString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop ); + QString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop ); + QString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop ); ++ QString help_icon_path = iconloader->iconPath("khelpcenter", KIcon::Desktop ); + QString home_folder = QDir::homeDirPath(); + QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); + +@@ -165,10 +166,10 @@ + .arg(iconSize).arg(iconSize) + .arg( i18n( "Applications" ) ) + .arg( i18n( "Installed programs" ) ) +- .arg( settings_icon_path ) ++ .arg( help_icon_path ) + .arg(iconSize).arg(iconSize) +- .arg( i18n( "Settings" ) ) +- .arg( i18n( "Desktop configuration" ) ) ++ .arg( i18n( "About Kubuntu" ) ) ++ .arg( i18n( "Kubuntu Documentation" ) ) + .arg( continue_icon_path ) + .arg( KIcon::SizeSmall ).arg( KIcon::SizeSmall ) + .arg( i18n( "Next: An Introduction to Konqueror" ) ) +diff -Nur kdebase-3.5.6/konqueror/about/launch.html kdebase-3.5.6.new/konqueror/about/launch.html +--- kdebase-3.5.6/konqueror/about/launch.html 2007-03-12 16:34:28.000000000 +0000 ++++ kdebase-3.5.6.new/konqueror/about/launch.html 2007-03-12 16:34:33.000000000 +0000 +@@ -110,10 +110,10 @@ + %1
%1 + + +- ++ + + +- %1
%1 ++ %1
%1 + + + --- kdebase-3.5.6.orig/debian/patches/20_applications_menu_move.diff +++ kdebase-3.5.6/debian/patches/20_applications_menu_move.diff @@ -0,0 +1,20 @@ +--- kde.orig/doc/userguide/kde-for-admins.docbook ++++ kde.patched/doc/userguide/kde-for-admins.docbook +@@ -1650,7 +1650,7 @@ + + + +-Example from applications.menu: ++Example from kde-applications.menu: + + + <Menu> +@@ -1724,7 +1724,7 @@ + information, see http://www.freedesktop.org/Standards/basedir-spec + + +-Example from applications.menu: ++Example from kde-applications.menu: + + + <Menu> --- kdebase-3.5.6.orig/debian/patches/kubuntu_93_konq_doc_remove_go_window_menu.diff +++ kdebase-3.5.6/debian/patches/kubuntu_93_konq_doc_remove_go_window_menu.diff @@ -0,0 +1,257 @@ +diff -Nru kdebase-3.5.6.orig/doc/konqueror/basics.docbook kdebase-3.5.6/doc/konqueror/basics.docbook +--- kdebase-3.5.6.orig/doc/konqueror/basics.docbook 2005-09-10 03:25:19.000000000 -0500 ++++ kdebase-3.5.6/doc/konqueror/basics.docbook 2007-03-15 01:05:10.000000000 -0500 +@@ -124,10 +124,7 @@ + Bookmarks section of this document. + + The Window is the main area of &konqueror; and +-can show you the contents of a directory, web page, document or image. Using +-the Window menu you can +-split &konqueror;'s main window into one or more separate views, useful for +-drag and drop operations, or set it to contain two or more tabbed views. ++can show you the contents of a directory, web page, document or image. + + + The Status Bar runs across the bottom of the +diff -Nru kdebase-3.5.6.orig/doc/konqueror/commands.docbook kdebase-3.5.6/doc/konqueror/commands.docbook +--- kdebase-3.5.6.orig/doc/konqueror/commands.docbook 2005-09-10 03:25:19.000000000 -0500 ++++ kdebase-3.5.6/doc/konqueror/commands.docbook 2007-03-15 01:03:55.000000000 -0500 +@@ -678,108 +678,6 @@ + + + +- +-The <guimenu>Go</guimenu> Menu +- +- +- +- +- +- +-&Alt;Up Arrow +-Go +-Up +- +-Go up a level in the folder +-hierarchy. +- +- +- +- +- +-&Alt;Left Arrow +-Go +-Back +- +-Go back to the previous +-view. +- +- +- +- +- +-&Alt;Right Arrow +-Go +-Forward +- +-You can only go forward if you've just gone +-back. +- +- +- +- +- +-&Ctrl;Home +-Go +-Home URL +- +-Go to your home folder. +- +- +- +- +-Go +-Applications +- +-Open the folder holding your +-applications. +- +- +- +- +-Go +-Trash +- +-Open your Trash +-folder in a separate window. +- +- +- +- +-Go +-Templates +- +-Open the Templates folder in a separate +-window. +- +- +- +- +-Go +-Autostart +- +-Open your Autostart folder in a separate +-window. +- +- +- +- +-Go +-Most Often Visited +- +- +-Displays a submenu showing the &URL;s you visit most often. Selecting one +-of these will make &konqueror; open that &URL;. +- +- +- +- +- +- +- + + The <guimenu>Bookmarks</guimenu> Menu + +@@ -1006,129 +904,6 @@ + + + +- +-The <guimenu>Window</guimenu> Menu +- +- +- +- +- +- +-&Ctrl;&Shift;L +-Window +-Split View Left/Right +- +-Split View Left/Right. +- +- +- +- +- +-&Ctrl;&Shift;T +-Window +-Split View Top/Bottom +- +-Split View Top/Bottom. +- +- +- +- +- +-&Ctrl;&Shift;R +-Window +-Remove Active View +- +-Remove Active View. +- +- +- +- +- +-&Ctrl;&Shift;N +-Window +-New Tab +- +-Open a new, empty, tab page. +- +- +- +- +- +-&Ctrl;&Shift;D +-Window +-Duplicate Current Tab +- +-Open a duplicate tab page. +- +- +- +- +- +-&Ctrl;&Shift;B +-Window +-Detach Current Tab +- +-Show the current tab page in a new instance of +-&konqueror;. +- +- +- +- +- +-&Ctrl;W +-Window +-Close Current Tab +- +-Close the current tab page. +- +- +- +- +- +-&Ctrl;&Shift;Left +-Window +-Move Tab Left +- +-Move the current tab one place left in the list of tabs. +- +- +- +- +- +-&Ctrl;&Shift;Left +-Window +-Move Tab Right +- +-Move the current tab one place right in the list of tabs. +- +- +- +- +-Window +-Show Terminal Emulator +- +-Open a small text terminal view at the bottom of the +- main +-window. +- +- +- +- +- +-F9 +-Window +-Show Navigation Panel +- +-Toggles the display of the &konqueror; navigation panel. See +-. +- +- +- +- +- +- + + The <guimenu>Help</guimenu> Menu + --- kdebase-3.5.6.orig/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/konsole/konsolesu.desktop 2005-03-17 01:34:39.399537064 +0000 ++++ kdebase/konsole/konsolesu.desktop 2005-03-17 01:34:44.692732376 +0000 +@@ -64,3 +64,4 @@ + Name[zh_CN]=ç»ˆç«¯ç¨‹åº - è¶…çº§ç”¨æˆ·æ¨¡å¼ + X-KDE-AuthorizeAction=shell_access + Categories=Qt;KDE;System;TerminalEmulator;X-KDE-More; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_25_kcontrol_only_in_kde.diff +++ kdebase-3.5.6/debian/patches/kubuntu_25_kcontrol_only_in_kde.diff @@ -0,0 +1,7 @@ +--- kdebase/kcontrol/kcontrol/KControl.desktop 2005-11-11 00:28:39.000000000 +0000 ++++ kdebase/kcontrol/kcontrol/KControl.desktop 2005-11-11 00:29:14.000000000 +0000 +@@ -87,3 +87,4 @@ + X-DCOP-ServiceType=Unique + Categories=Qt;KDE;Core; + OnlyShowIn=KDE; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_86_konsole_pty.diff +++ kdebase-3.5.6/debian/patches/kubuntu_86_konsole_pty.diff @@ -0,0 +1,46 @@ +--- kdebase-3.5.5a.dfsg.1.orig/konsole/konsole/konsole_part.cpp ++++ kdebase-3.5.5a.dfsg.1/konsole/konsole/konsole_part.cpp +@@ -1056,6 +1056,16 @@ + se->run(); + } + ++bool konsolePart::setPtyFd( int master_pty ) ++{ ++ kdDebug(1211) << "konsolePart::setPtyFd " << master_pty << endl; ++ TEPty *pty = new TEPty(); ++ pty->setPtyFd(master_pty); ++ if ( !se ) ++ newSession(); ++ se->setPty(pty); ++} ++ + void konsolePart::newSession() + { + if ( se ) delete se; +--- kdebase-3.5.5a.dfsg.1.orig/konsole/konsole/TEPty.h ++++ kdebase-3.5.5a.dfsg.1/konsole/konsole/TEPty.h +@@ -39,6 +39,13 @@ + ~TEPty(); + + public: ++ bool setPtyFd(int p) { ++ bool res = pty()->setPty(p); ++ setupCommunication((Communication)(Stdin|Stdout)); ++ commSetupDoneP(); ++ runs = true; ++ return res; ++ }; + + /*! + * having a `run' separate from the constructor allows to make +--- kdebase-3.5.5a.dfsg.1.orig/konsole/konsole/konsole_part.h ++++ kdebase-3.5.5a.dfsg.1/konsole/konsole/konsole_part.h +@@ -190,6 +190,8 @@ + int n_encoding; + + public: ++ virtual bool setPtyFd(int); ++ + // these are the implementations for the TermEmuInterface + // functions... + void startProgram( const QString& program, --- kdebase-3.5.6.orig/debian/patches/kubuntu_68_xinerama.diff +++ kdebase-3.5.6/debian/patches/kubuntu_68_xinerama.diff @@ -0,0 +1,928 @@ +diff -u -p -N -r kdebase.sav/kdesktop/desktop.cc kdebase/kdesktop/desktop.cc +--- kdebase.sav/kdesktop/desktop.cc 2006-09-01 13:22:32.000000000 +0200 ++++ kdebase/kdesktop/desktop.cc 2006-09-01 13:26:24.000000000 +0200 +@@ -516,9 +516,12 @@ void KDesktop::popupExecuteCommand(const + if ( m_miniCli->isVisible() ) { + KWin::forceActiveWindow( m_miniCli->winId() ); + } else { +- QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos()); +- m_miniCli->move(rect.x() + (rect.width() - m_miniCli->width())/2, +- rect.y() + (rect.height() - m_miniCli->height())/2); ++ NETRootInfo i( qt_xdisplay(), NET::Supported ); ++ if( !i.isSupported( NET::WM2FullPlacement )) { ++ QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos()); ++ m_miniCli->move(rect.x() + (rect.width() - m_miniCli->width())/2, ++ rect.y() + (rect.height() - m_miniCli->height())/2); ++ } + m_miniCli->show(); // non-modal + } + } +diff -u -p -N -r kdebase.sav/kdesktop/minicli.cpp kdebase/kdesktop/minicli.cpp +--- kdebase.sav/kdesktop/minicli.cpp 2006-04-13 14:02:46.000000000 +0200 ++++ kdebase/kdesktop/minicli.cpp 2006-09-01 13:27:04.000000000 +0200 +@@ -369,6 +369,17 @@ int Minicli::runCommand() + cmd = uri.path(); + else + cmd = uri.url(); ++ ++ QCString asn; ++ if( qApp->desktop()->isVirtualDesktop()) ++ { ++ asn = KStartupInfo::createNewStartupId(); ++ KStartupInfoId id; ++ id.initId( asn ); ++ KStartupInfoData data; ++ data.setXinerama( qApp->desktop()->screenNumber( this )); ++ KStartupInfo::sendChange( id, data ); ++ } + + // Determine whether the application should be run through + // the command line (terminal) interface... +@@ -504,7 +515,7 @@ int Minicli::runCommand() + case KURIFilterData::HELP: + { + // No need for kfmclient, KRun does it all (David) +- (void) new KRun( m_filterData->uri(), parentWidget()); ++ (void) new KRun( m_filterData->uri(), parentWidget(), asn ); + return 0; + } + case KURIFilterData::EXECUTABLE: +@@ -516,7 +527,7 @@ int Minicli::runCommand() + if (service && service->isValid() && service->type() == "Application") + { + notifyServiceStarted(service); +- KRun::run(*service, KURL::List()); ++ KRun::run(*service, KURL::List(), parentWidget(), asn ); + return 0; + } + } +@@ -551,7 +562,7 @@ int Minicli::runCommand() + if (service && service->isValid() && service->type() == "Application") + { + notifyServiceStarted(service); +- KRun::run(*service, KURL::List(), this); ++ KRun::run(*service, KURL::List(), parentWidget(), asn ); + return 0; + } + +@@ -559,7 +570,7 @@ int Minicli::runCommand() + if (service && service->isValid() && service->type() == "Application") + { + notifyServiceStarted(service); +- KRun::run(*service, KURL::List(), this); ++ KRun::run(*service, KURL::List(), parentWidget(), asn ); + return 0; + } + +@@ -571,7 +582,7 @@ int Minicli::runCommand() + } + } + +- if ( KRun::runCommand( cmd, exec, m_iconName ) ) ++ if ( KRun::runCommand( cmd, exec, m_iconName, parentWidget(), asn ) ) + return 0; + else + { +diff -u -p -N -r kdebase.sav/kwin/activation.cpp kdebase/kwin/activation.cpp +--- kdebase.sav/kwin/activation.cpp 2006-04-13 14:03:15.000000000 +0200 ++++ kdebase/kwin/activation.cpp 2006-09-01 13:27:34.000000000 +0200 +@@ -358,6 +358,8 @@ void Workspace::takeActivity( Client* c, + return; + } + c->takeActivity( flags, handled, Allowed ); ++ if( !c->isOnScreen( active_screen )) ++ active_screen = c->screen(); + } + + void Workspace::handleTakeActivity( Client* c, Time /*timestamp*/, int flags ) +@@ -411,6 +413,13 @@ bool Workspace::activateNextClient( Clie + { + if( !(*it)->isShown( false ) || !(*it)->isOnCurrentDesktop()) + continue; ++ if( options->separateScreenFocus ) ++ { ++ if( c != NULL && !(*it)->isOnScreen( c->screen())) ++ continue; ++ if( c == NULL && !(*it)->isOnScreen( activeScreen())) ++ continue; ++ } + if( mainwindows.contains( *it )) + { + get_focus = *it; +@@ -436,6 +445,31 @@ bool Workspace::activateNextClient( Clie + return true; + } + ++void Workspace::setCurrentScreen( int new_screen ) ++ { ++ if (new_screen < 0 || new_screen > numScreens()) ++ return; ++ if ( !options->focusPolicyIsReasonable()) ++ return; ++ closeActivePopup(); ++ Client* get_focus = NULL; ++ for( ClientList::ConstIterator it = focus_chain[currentDesktop()].fromLast(); ++ it != focus_chain[currentDesktop()].end(); ++ --it ) ++ { ++ if( !(*it)->isShown( false ) || !(*it)->isOnCurrentDesktop()) ++ continue; ++ if( !(*it)->screen() == new_screen ) ++ continue; ++ get_focus = *it; ++ break; ++ } ++ if( get_focus == NULL ) ++ get_focus = findDesktop( true, currentDesktop()); ++ if( get_focus != NULL && get_focus != mostRecentlyActivatedClient()) ++ requestFocus( get_focus ); ++ active_screen = new_screen; ++ } + + void Workspace::gotFocusIn( const Client* c ) + { +@@ -858,6 +892,8 @@ void Client::startupIdChanged() + desktop = asn_data.desktop(); + if( !isOnAllDesktops()) + workspace()->sendClientToDesktop( this, desktop, true ); ++ if( asn_data.xinerama() != -1 ) ++ workspace()->sendClientToScreen( this, asn_data.xinerama()); + Time timestamp = asn_id.timestamp(); + if( timestamp == 0 && asn_data.timestamp() != -1U ) + timestamp = asn_data.timestamp(); +diff -u -p -N -r kdebase.sav/kwin/client.cpp kdebase/kwin/client.cpp +--- kdebase.sav/kwin/client.cpp 2006-08-18 15:43:34.000000000 +0200 ++++ kdebase/kwin/client.cpp 2006-09-01 13:26:00.000000000 +0200 +@@ -1235,6 +1235,20 @@ bool Client::isOnCurrentDesktop() const + return isOnDesktop( workspace()->currentDesktop()); + } + ++int Client::screen() const ++ { ++ if( !options->xineramaEnabled ) ++ return 0; ++ return workspace()->screenNumber( geometry().center()); ++ } ++ ++bool Client::isOnScreen( int screen ) const ++ { ++ if( !options->xineramaEnabled ) ++ return screen == 0; ++ return workspace()->screenGeometry( screen ).intersects( geometry()); ++ } ++ + // performs activation and/or raising of the window + void Client::takeActivity( int flags, bool handled, allowed_t ) + { +diff -u -p -N -r kdebase.sav/kwin/client.h kdebase/kwin/client.h +--- kdebase.sav/kwin/client.h 2006-04-13 14:03:15.000000000 +0200 ++++ kdebase/kwin/client.h 2006-09-01 13:26:00.000000000 +0200 +@@ -116,6 +116,9 @@ class Client : public QObject, public KD + bool isOnCurrentDesktop() const; + bool isOnAllDesktops() const; + void setOnAllDesktops( bool set ); ++ ++ bool isOnScreen( int screen ) const; // true if it's at least partially there ++ int screen() const; // the screen where the center is + + // !isMinimized() && not hidden, i.e. normally visible on some virtual desktop + bool isShown( bool shaded_is_shown ) const; +diff -u -p -N -r kdebase.sav/kwin/geometry.cpp kdebase/kwin/geometry.cpp +--- kdebase.sav/kwin/geometry.cpp 2006-08-10 15:05:22.000000000 +0200 ++++ kdebase/kwin/geometry.cpp 2006-09-01 13:27:39.000000000 +0200 +@@ -205,14 +205,11 @@ void Workspace::updateClientArea() + + \sa geometry() + */ +-QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop ) const ++QRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) const + { + if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 ) + desktop = currentDesktop(); + QDesktopWidget *desktopwidget = KApplication::desktop(); +- int screen = desktopwidget->screenNumber( p ); +- if( screen < 0 ) +- screen = desktopwidget->primaryScreen(); + QRect sarea = screenarea // may be NULL during KWin initialization + ? screenarea[ desktop ][ screen ] + : desktopwidget->screenGeometry( screen ); +@@ -257,11 +254,21 @@ QRect Workspace::clientArea( clientAreaO + return QRect(); + } + ++QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop ) const ++ { ++ QDesktopWidget *desktopwidget = KApplication::desktop(); ++ int screen = desktopwidget->screenNumber( p ); ++ if( screen < 0 ) ++ screen = desktopwidget->primaryScreen(); ++ return clientArea( opt, screen, desktop ); ++ } ++ + QRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const + { + return clientArea( opt, c->geometry().center(), c->desktop()); + } + ++ + /*! + Client \a c is moved around to position \a pos. This gives the + workspace the opportunity to interveniate and to implement +@@ -890,10 +897,6 @@ void Client::checkWorkspacePosition() + setGeometry( area ); + return; + } +- if( maximizeMode() != MaximizeRestore ) +- // TODO update geom_restore? +- changeMaximize( false, false, true ); // adjust size +- + if( isFullScreen()) + { + QRect area = workspace()->clientArea( FullScreenArea, this ); +@@ -920,6 +923,10 @@ void Client::checkWorkspacePosition() + return; + } + ++ if( maximizeMode() != MaximizeRestore ) ++ // TODO update geom_restore? ++ changeMaximize( false, false, true ); // adjust size ++ + if( !isShade()) // TODO + { + int old_diff_x = workarea_diff_x; +@@ -1715,6 +1722,7 @@ void Client::setGeometry( int x, int y, + sendSyntheticConfigureNotify(); + updateWindowRules(); + checkMaximizeGeometry(); ++ workspace()->checkActiveScreen( this ); + } + + void Client::plainResize( int w, int h, ForceGeometry_t force ) +@@ -1768,6 +1776,7 @@ void Client::plainResize( int w, int h, + sendSyntheticConfigureNotify(); + updateWindowRules(); + checkMaximizeGeometry(); ++ workspace()->checkActiveScreen( this ); + } + + /*! +@@ -1788,6 +1797,7 @@ void Client::move( int x, int y, ForceGe + sendSyntheticConfigureNotify(); + updateWindowRules(); + checkMaximizeGeometry(); ++ workspace()->checkActiveScreen( this ); + } + + +diff -u -p -N -r kdebase.sav/kwin/kcmkwin/kwinoptions/windows.cpp kdebase/kwin/kcmkwin/kwinoptions/windows.cpp +--- kdebase.sav/kwin/kcmkwin/kwinoptions/windows.cpp 2006-09-01 13:22:04.000000000 +0200 ++++ kdebase/kwin/kcmkwin/kwinoptions/windows.cpp 2006-09-01 15:54:18.000000000 +0200 +@@ -76,6 +76,8 @@ + #define KWIN_SHADEHOVER_INTERVAL "ShadeHoverInterval" + #define KWIN_FOCUS_STEALING "FocusStealingPreventionLevel" + #define KWIN_HIDE_UTILITY "HideUtilityWindowsForInactive" ++#define KWIN_SEPARATE_SCREEN_FOCUS "SeparateScreenFocus" ++#define KWIN_ACTIVE_MOUSE_SCREEN "ActiveMouseScreen" + + // kwm config keywords + #define KWM_ELECTRIC_BORDER "ElectricBorders" +@@ -209,6 +211,27 @@ KFocusConfig::KFocusConfig (bool _standA + QWhatsThis::add( delayFocus, i18n("This is the delay after which the window the mouse pointer is over" + " will automatically receive focus.") ); + ++ separateScreenFocus = new QCheckBox( i18n( "S&eparate screen focus" ), fcsBox ); ++ fLay->addWidget( separateScreenFocus ); ++ wtstr = i18n( "When this option is enabled, focus operations are limited only to the active Xinerama screen" ); ++ QWhatsThis::add( separateScreenFocus, wtstr ); ++ ++ activeMouseScreen = new QCheckBox( i18n( "Active &mouse screen" ), fcsBox ); ++ fLay->addWidget( activeMouseScreen ); ++ wtstr = i18n( "When this option is enabled, active Xinerama screen (where for example new windows appear)" ++ " is the screen with the mouse pointer. When disabled, the active Xinerama screen is the screen" ++ " with the focused window. This option is by default disabled for Click to focus and" ++ " enabled for other focus policies." ); ++ QWhatsThis::add( activeMouseScreen, wtstr ); ++ connect(focusCombo, SIGNAL(activated(int)), this, SLOT(updateActiveMouseScreen())); ++ ++ if (!QApplication::desktop()->isVirtualDesktop() || ++ QApplication::desktop()->numScreens() == 1) // No Ximerama ++ { ++ separateScreenFocus->hide(); ++ activeMouseScreen->hide(); ++ } ++ + lay->addWidget(fcsBox); + + kbdBox = new QButtonGroup(i18n("Navigation"), this); +@@ -260,6 +283,8 @@ KFocusConfig::KFocusConfig (bool _standA + connect(fcsBox, SIGNAL(clicked(int)), SLOT(changed())); + connect(autoRaise, SIGNAL(valueChanged(int)), SLOT(changed())); + connect(delayFocus, SIGNAL(valueChanged(int)), SLOT(changed())); ++ connect(separateScreenFocus, SIGNAL(clicked()), SLOT(changed())); ++ connect(activeMouseScreen, SIGNAL(clicked()), SLOT(changed())); + connect(altTabPopup, SIGNAL(clicked()), SLOT(changed())); + connect(traverseAll, SIGNAL(clicked()), SLOT(changed())); + connect(rollOverDesktops, SIGNAL(clicked()), SLOT(changed())); +@@ -366,6 +391,22 @@ void KFocusConfig::delayFocusOnTog(bool + void KFocusConfig::clickRaiseOnTog(bool ) { + } + ++void KFocusConfig::setSeparateScreenFocus(bool s) { ++ separateScreenFocus->setChecked(s); ++} ++ ++void KFocusConfig::setActiveMouseScreen(bool a) { ++ activeMouseScreen->setChecked(a); ++} ++ ++void KFocusConfig::updateActiveMouseScreen() ++{ ++ // on by default for non click to focus policies ++ KConfigGroup cfg( config, "Windows" ); ++ if( !cfg.hasKey( KWIN_ACTIVE_MOUSE_SCREEN )) ++ setActiveMouseScreen( focusCombo->currentItem() != 0 ); ++} ++ + void KFocusConfig::setAltTabMode(bool a) { + altTabPopup->setChecked(a); + } +@@ -412,6 +453,10 @@ void KFocusConfig::load( void ) + setClickRaise(key != "off"); + setAutoRaiseEnabled(); // this will disable/hide the auto raise delay widget if focus==click + setDelayFocusEnabled(); ++ ++ setSeparateScreenFocus( config->readBoolEntry(KWIN_SEPARATE_SCREEN_FOCUS, false)); ++ // on by default for non click to focus policies ++ setActiveMouseScreen( config->readBoolEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentItem() != 0 )); + + key = config->readEntry(KWIN_ALTTABMODE, "KDE"); + setAltTabMode(key == "KDE"); +@@ -467,6 +512,9 @@ void KFocusConfig::save( void ) + else + config->writeEntry(KWIN_CLICKRAISE, "off"); + ++ config->writeEntry(KWIN_SEPARATE_SCREEN_FOCUS, separateScreenFocus->isChecked()); ++ config->writeEntry(KWIN_ACTIVE_MOUSE_SCREEN, activeMouseScreen->isChecked()); ++ + if (altTabPopup->isChecked()) + config->writeEntry(KWIN_ALTTABMODE, "KDE"); + else +@@ -500,6 +548,9 @@ void KFocusConfig::defaults() + setAutoRaise(false); + setDelayFocus(false); + setClickRaise(true); ++ setSeparateScreenFocus( false ); ++ // on by default for non click to focus policies ++ setActiveMouseScreen( focusCombo->currentItem() != 0 ); + setAltTabMode(true); + setTraverseAll( false ); + setRollOverDesktops(true); +diff -u -p -N -r kdebase.sav/kwin/kcmkwin/kwinoptions/windows.h kdebase/kwin/kcmkwin/kwinoptions/windows.h +--- kdebase.sav/kwin/kcmkwin/kwinoptions/windows.h 2006-04-13 14:03:15.000000000 +0200 ++++ kdebase/kwin/kcmkwin/kwinoptions/windows.h 2006-09-01 15:54:18.000000000 +0200 +@@ -86,6 +86,7 @@ private slots: + void delayFocusOnTog(bool); + void clickRaiseOnTog(bool); + void updateAltTabMode(); ++ void updateActiveMouseScreen(); + void changed() { emit KCModule::changed(true); } + + +@@ -101,6 +102,8 @@ private: + void setDelayFocusInterval(int); + void setDelayFocus(bool); + void setClickRaise(bool); ++ void setSeparateScreenFocus(bool); ++ void setActiveMouseScreen(bool); + void setAltTabMode(bool); + void setTraverseAll(bool); + void setRollOverDesktops(bool); +@@ -113,6 +116,8 @@ private: + QCheckBox *clickRaiseOn; + KIntNumInput *autoRaise; + KIntNumInput *delayFocus; ++ QCheckBox *separateScreenFocus; ++ QCheckBox *activeMouseScreen; + + QButtonGroup *kbdBox; + QCheckBox *altTabPopup; +diff -u -p -N -r kdebase.sav/kwin/kwinbindings.cpp kdebase/kwin/kwinbindings.cpp +--- kdebase.sav/kwin/kwinbindings.cpp 2005-09-19 20:44:41.000000000 +0200 ++++ kdebase/kwin/kwinbindings.cpp 2006-09-01 13:26:35.000000000 +0200 +@@ -104,6 +104,15 @@ + DEF( I18N_NOOP("Window One Desktop to the Left"), 0, 0, slotWindowToDesktopLeft() ); + DEF( I18N_NOOP("Window One Desktop Up"), 0, 0, slotWindowToDesktopUp() ); + DEF( I18N_NOOP("Window One Desktop Down"), 0, 0, slotWindowToDesktopDown() ); ++ DEF( I18N_NOOP("Window to Screen 0"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Screen 1"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Screen 2"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Screen 3"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Screen 4"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Screen 5"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Screen 6"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Screen 7"), 0, 0, slotWindowToScreen(int) ); ++ DEF( I18N_NOOP("Window to Next Screen"), 0, 0, slotWindowToNextScreen() ); + + keys->insert( "Group:Desktop Switching", i18n("Desktop Switching") ); + DEF( I18N_NOOP("Switch to Desktop 1"), CTRL+Qt::Key_F1, WIN+Qt::Key_F1, slotSwitchToDesktop(int) ); +@@ -132,6 +141,15 @@ + DEF( I18N_NOOP("Switch One Desktop to the Left"), 0, 0, slotSwitchDesktopLeft() ); + DEF( I18N_NOOP("Switch One Desktop Up"), 0, 0, slotSwitchDesktopUp() ); + DEF( I18N_NOOP("Switch One Desktop Down"), 0, 0, slotSwitchDesktopDown() ); ++ DEF( I18N_NOOP("Switch to Screen 0"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Screen 1"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Screen 2"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Screen 3"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Screen 4"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Screen 5"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Screen 6"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Screen 7"), 0, 0, slotSwitchToScreen(int) ); ++ DEF( I18N_NOOP("Switch to Next Screen"), 0, 0, slotSwitchToNextScreen() ); + + keys->insert( "Group:Miscellaneous", i18n("Miscellaneous") ); + DEF( I18N_NOOP("Mouse Emulation"), ALT+Qt::Key_F12, 0, slotMouseEmulation() ); +diff -u -p -N -r kdebase.sav/kwin/kwin.kcfg kdebase/kwin/kwin.kcfg +--- kdebase.sav/kwin/kwin.kcfg 2006-08-02 18:25:50.000000000 +0200 ++++ kdebase/kwin/kwin.kcfg 2006-09-01 13:26:05.000000000 +0200 +@@ -60,6 +60,9 @@ + + + ++ ++ ++ + + + +diff -u -p -N -r kdebase.sav/kwin/manage.cpp kdebase/kwin/manage.cpp +--- kdebase.sav/kwin/manage.cpp 2006-08-10 15:05:22.000000000 +0200 ++++ kdebase/kwin/manage.cpp 2006-09-01 13:27:09.000000000 +0200 +@@ -166,7 +166,7 @@ bool Client::manage( Window w, bool isMa + it != mainclients.end(); + ++it ) + { +- if( (*it)->isSpecialWindow()) ++ if( mainclients.count() > 1 && (*it)->isSpecialWindow()) + continue; // don't consider toolbars etc when placing + maincl = *it; + if( (*it)->isOnCurrentDesktop()) +@@ -202,9 +202,14 @@ bool Client::manage( Window w, bool isMa + if( isMapped || session ) + area = workspace()->clientArea( FullArea, geom.center(), desktop()); + else if( options->xineramaPlacementEnabled ) +- area = workspace()->clientArea( PlacementArea, QCursor::pos(), desktop()); ++ { ++ int screen = options->xineramaPlacementScreen; ++ if( screen == -1 ) // active screen ++ screen = asn_data.xinerama() == -1 ? workspace()->activeScreen() : asn_data.xinerama(); ++ area = workspace()->clientArea( PlacementArea, workspace()->screenGeometry( screen ).center(), desktop()); ++ } + else +- area = workspace()->clientArea( PlacementArea, geom.center(), desktop()); ++ area = workspace()->clientArea( PlacementArea, QCursor::pos(), desktop()); + + if( int type = checkFullScreenHack( geom )) + { +diff -u -p -N -r kdebase.sav/kwin/options.cpp kdebase/kwin/options.cpp +--- kdebase.sav/kwin/options.cpp 2006-08-02 18:25:50.000000000 +0200 ++++ kdebase/kwin/options.cpp 2006-09-01 13:26:05.000000000 +0200 +@@ -70,6 +70,9 @@ unsigned long Options::updateSettings() + altTabStyle = KDE; // what a default :-) + if ( val == "CDE" ) + altTabStyle = CDE; ++ ++ separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", true ); ++ activeMouseScreen = config->readBoolEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus ); + + rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE); + +@@ -99,9 +102,10 @@ unsigned long Options::updateSettings() + delete gc; + + placement = Placement::policyFromString( config->readEntry("Placement"), true ); ++ xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), ++ -1, qApp->desktop()->numScreens() - 1 ); + + animateShade = config->readBoolEntry("AnimateShade", TRUE ); +- + animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); + animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 ); + +diff -u -p -N -r kdebase.sav/kwin/options.h kdebase/kwin/options.h +--- kdebase.sav/kwin/options.h 2006-08-02 18:25:50.000000000 +0200 ++++ kdebase/kwin/options.h 2006-09-01 13:26:05.000000000 +0200 +@@ -124,6 +124,11 @@ class Options : public KDecorationOption + */ + enum AltTabStyle { KDE, CDE }; + AltTabStyle altTabStyle; ++ ++ // whether to see Xinerama screens separately for focus (in Alt+Tab, when activating next client) ++ bool separateScreenFocus; ++ // whether active Xinerama screen is the one with mouse (or with the active window) ++ bool activeMouseScreen; + + /** + * Xinerama options +@@ -133,6 +138,9 @@ class Options : public KDecorationOption + bool xineramaMovementEnabled; + bool xineramaMaximizeEnabled; + bool xineramaFullscreenEnabled; ++ ++ // number, or -1 = active screen (Workspace::activeScreen()) ++ int xineramaPlacementScreen; + + /** + MoveResizeMode, either Tranparent or Opaque. +diff -u -p -N -r kdebase.sav/kwin/placement.cpp kdebase/kwin/placement.cpp +--- kdebase.sav/kwin/placement.cpp 2006-01-04 14:58:52.000000000 +0100 ++++ kdebase/kwin/placement.cpp 2006-09-01 13:26:28.000000000 +0200 +@@ -473,7 +473,7 @@ void Placement::placeOnMainWindow(Client + it != mainwindows.end(); + ++it ) + { +- if( (*it)->isSpecialWindow()) ++ if( mainwindows.count() > 1 && (*it)->isSpecialWindow()) + continue; // don't consider toolbars etc when placing + ++mains_count; + place_on2 = *it; +@@ -502,6 +502,11 @@ void Placement::placeOnMainWindow(Client + } + place_on = place_on2; // use the only window filtered together with 'mains_count' + } ++ if( place_on->isDesktop()) ++ { ++ place( c, area, Centered ); ++ return; ++ } + QRect geom = c->geometry(); + geom.moveCenter( place_on->geometry().center()); + c->move( geom.topLeft()); +diff -u -p -N -r kdebase.sav/kwin/popupinfo.cpp kdebase/kwin/popupinfo.cpp +--- kdebase.sav/kwin/popupinfo.cpp 2006-04-13 14:03:15.000000000 +0200 ++++ kdebase/kwin/popupinfo.cpp 2006-09-01 13:26:00.000000000 +0200 +@@ -25,7 +25,6 @@ License. See the file "COPYING" for the + #include + #include + #include +-#include + #include + #include + +@@ -34,8 +33,8 @@ License. See the file "COPYING" for the + namespace KWinInternal + { + +-PopupInfo::PopupInfo( const char *name ) +- : QWidget( 0, name ) ++PopupInfo::PopupInfo( Workspace* ws, const char *name ) ++ : QWidget( 0, name ), workspace( ws ) + { + m_infoString = ""; + m_shown = false; +@@ -60,7 +59,7 @@ PopupInfo::~PopupInfo() + */ + void PopupInfo::reset() + { +- QRect r = KGlobalSettings::desktopGeometry(QCursor::pos()); ++ QRect r = workspace->screenGeometry( workspace->activeScreen()); + + int w = fontMetrics().width( m_infoString ) + 30; + +diff -u -p -N -r kdebase.sav/kwin/popupinfo.h kdebase/kwin/popupinfo.h +--- kdebase.sav/kwin/popupinfo.h 2005-05-04 17:03:21.000000000 +0200 ++++ kdebase/kwin/popupinfo.h 2006-09-01 13:26:00.000000000 +0200 +@@ -24,7 +24,7 @@ class PopupInfo : public QWidget + { + Q_OBJECT + public: +- PopupInfo( const char *name=0 ); ++ PopupInfo( Workspace* ws, const char *name=0 ); + ~PopupInfo(); + + void reset(); +@@ -43,6 +43,7 @@ class PopupInfo : public QWidget + bool m_show; + bool m_shown; + QString m_infoString; ++ Workspace* workspace; + }; + + } // namespace +diff -u -p -N -r kdebase.sav/kwin/tabbox.cpp kdebase/kwin/tabbox.cpp +--- kdebase.sav/kwin/tabbox.cpp 2006-09-01 13:22:04.000000000 +0200 ++++ kdebase/kwin/tabbox.cpp 2006-09-01 13:26:00.000000000 +0200 +@@ -23,7 +23,6 @@ License. See the file "COPYING" for the + #include + #include + #include +-#include + #include + #include + #include +@@ -111,26 +110,36 @@ void TabBox::createClientList(ClientList + + while ( c ) + { ++ Client* add = NULL; + if ( ((desktop == -1) || c->isOnDesktop(desktop)) + && c->wantsTabFocus() ) ++ { // don't add windows that have modal dialogs ++ Client* modal = c->findModal(); ++ if( modal == NULL || modal == c ) ++ add = c; ++ else if( !list.contains( modal )) ++ add = modal; ++ else ++ { ++ // nothing ++ } ++ } ++ ++ if( !options->separateScreenFocus && options->xineramaEnabled ) + { +- if ( start == c ) ++ if( c->screen() != workspace()->activeScreen()) ++ add = NULL; ++ } ++ ++ if( add != NULL ) ++ { ++ if ( start == add ) + { +- list.remove( c ); +- list.prepend( c ); ++ list.remove( add ); ++ list.prepend( add ); + } + else +- { // don't add windows that have modal dialogs +- Client* modal = c->findModal(); +- if( modal == NULL || modal == c ) +- list += c; +- else if( !list.contains( modal )) +- list += modal; +- else +- { +- // nothing +- } +- } ++ list += add; + } + + if ( chain ) +@@ -157,7 +166,7 @@ void TabBox::reset() + { + int w, h, cw = 0, wmax = 0; + +- QRect r = KGlobalSettings::desktopGeometry(QCursor::pos()); ++ QRect r = workspace()->screenGeometry( workspace()->activeScreen()); + + // calculate height of 1 line + // fontheight + 1 pixel above + 1 pixel below, or 32x32 icon + 2 pixel above + below +diff -u -p -N -r kdebase.sav/kwin/useractions.cpp kdebase/kwin/useractions.cpp +--- kdebase.sav/kwin/useractions.cpp 2006-07-31 11:46:28.000000000 +0200 ++++ kdebase/kwin/useractions.cpp 2006-09-01 13:27:44.000000000 +0200 +@@ -482,27 +482,33 @@ bool Client::performMouseCommand( Option + case Options::MouseActivateAndRaise: + replay = isActive(); // for clickraise mode + workspace()->takeActivity( this, ActivityFocus | ActivityRaise, handled && replay ); ++ workspace()->setActiveScreenMouse( globalPos ); + break; + case Options::MouseActivateAndLower: + workspace()->requestFocus( this ); + workspace()->lowerClient( this ); ++ workspace()->setActiveScreenMouse( globalPos ); + break; + case Options::MouseActivate: + replay = isActive(); // for clickraise mode + workspace()->takeActivity( this, ActivityFocus, handled && replay ); ++ workspace()->setActiveScreenMouse( globalPos ); + break; + case Options::MouseActivateRaiseAndPassClick: + workspace()->takeActivity( this, ActivityFocus | ActivityRaise, handled ); ++ workspace()->setActiveScreenMouse( globalPos ); + replay = TRUE; + break; + case Options::MouseActivateAndPassClick: + workspace()->takeActivity( this, ActivityFocus, handled ); ++ workspace()->setActiveScreenMouse( globalPos ); + replay = TRUE; + break; + case Options::MouseActivateRaiseAndMove: + case Options::MouseActivateRaiseAndUnrestrictedMove: + workspace()->raiseClient( this ); + workspace()->requestFocus( this ); ++ workspace()->setActiveScreenMouse( globalPos ); + if( options->moveMode == Options::Transparent && isMovable()) + move_faked_activity = workspace()->fakeRequestedActivity( this ); + // fallthrough +@@ -709,6 +715,40 @@ void Workspace::slotWindowToDesktop( int + sendClientToDesktop( c, i, true ); + } + ++void Workspace::slotSwitchToScreen( int i ) ++ { ++ setCurrentScreen( i ); ++ } ++ ++void Workspace::slotSwitchToNextScreen() ++ { ++ slotSwitchToScreen(( activeScreen() + 1 ) % numScreens()); ++ } ++ ++void Workspace::slotWindowToScreen( int i ) ++ { ++ Client* c = active_popup_client ? active_popup_client : active_client; ++ if( i >= 0 && i <= numScreens() && c ++ && !c->isDesktop() ++ && !c->isDock() ++ && !c->isTopMenu()) ++ { ++ sendClientToScreen( c, i ); ++ } ++ } ++ ++void Workspace::slotWindowToNextScreen() ++ { ++ Client* c = active_popup_client ? active_popup_client : active_client; ++ if( c ++ && !c->isDesktop() ++ && !c->isDock() ++ && !c->isTopMenu()) ++ { ++ sendClientToScreen( c, ( c->screen() + 1 ) % numScreens()); ++ } ++ } ++ + /*! + Maximizes the popup client + */ +diff -u -p -N -r kdebase.sav/kwin/workspace.cpp kdebase/kwin/workspace.cpp +--- kdebase.sav/kwin/workspace.cpp 2006-08-02 18:25:50.000000000 +0200 ++++ kdebase/kwin/workspace.cpp 2006-09-01 13:27:44.000000000 +0200 +@@ -70,6 +70,7 @@ Workspace::Workspace( bool restore ) + QObject (0, "workspace"), + current_desktop (0), + number_of_desktops(0), ++ active_screen (0), + active_popup( NULL ), + active_popup_client( NULL ), + desktop_widget (0), +@@ -189,7 +190,7 @@ Workspace::Workspace( bool restore ) + client_keys = new KGlobalAccel( this ); + initShortcuts(); + tab_box = new TabBox( this ); +- popupinfo = new PopupInfo( ); ++ popupinfo = new PopupInfo( this ); + + init(); + +@@ -288,6 +289,7 @@ void Workspace::init() + NET::WM2ExtendedStrut | + NET::WM2KDETemporaryRules | + NET::WM2ShowingDesktop | ++ NET::WM2FullPlacement | + 0 + , + NET::ActionMove | +@@ -1502,6 +1504,80 @@ void Workspace::sendClientToDesktop( Cli + updateClientArea(); + } + ++int Workspace::numScreens() const ++ { ++ if( !options->xineramaEnabled ) ++ return 0; ++ return qApp->desktop()->numScreens(); ++ } ++ ++int Workspace::activeScreen() const ++ { ++ if( !options->xineramaEnabled ) ++ return 0; ++ if( !options->activeMouseScreen ) ++ { ++ if( activeClient() != NULL && !activeClient()->isOnScreen( active_screen )) ++ return qApp->desktop()->screenNumber( activeClient()->geometry().center()); ++ return active_screen; ++ } ++ return qApp->desktop()->screenNumber( QCursor::pos()); ++ } ++ ++// check whether a client moved completely out of what's considered the active screen, ++// if yes, set a new active screen ++void Workspace::checkActiveScreen( const Client* c ) ++ { ++ if( !options->xineramaEnabled ) ++ return; ++ if( !c->isActive()) ++ return; ++ if( !c->isOnScreen( active_screen )) ++ active_screen = c->screen(); ++ } ++ ++// called e.g. when a user clicks on a window, set active screen to be the screen ++// where the click occured ++void Workspace::setActiveScreenMouse( QPoint mousepos ) ++ { ++ if( !options->xineramaEnabled ) ++ return; ++ active_screen = qApp->desktop()->screenNumber( mousepos ); ++ } ++ ++QRect Workspace::screenGeometry( int screen ) const ++ { ++ if( !options->xineramaEnabled ) ++ return qApp->desktop()->geometry(); ++ return qApp->desktop()->screenGeometry( screen ); ++ } ++ ++int Workspace::screenNumber( QPoint pos ) const ++ { ++ if( !options->xineramaEnabled ) ++ return 0; ++ return qApp->desktop()->screenNumber( pos ); ++ } ++ ++void Workspace::sendClientToScreen( Client* c, int screen ) ++ { ++ if( c->screen() == screen ) // don't use isOnScreen(), that's true even when only partially ++ return; ++ GeometryUpdatesPostponer blocker( c ); ++ QRect old_sarea = clientArea( MaximizeArea, c ); ++ QRect sarea = clientArea( MaximizeArea, screen, c->desktop()); ++ c->setGeometry( sarea.x() - old_sarea.x() + c->x(), sarea.y() - old_sarea.y() + c->y(), ++ c->size().width(), c->size().height()); ++ c->checkWorkspacePosition(); ++ ClientList transients_stacking_order = ensureStackingOrder( c->transients()); ++ for( ClientList::ConstIterator it = transients_stacking_order.begin(); ++ it != transients_stacking_order.end(); ++ ++it ) ++ sendClientToScreen( *it, screen ); ++ if( c->isActive()) ++ active_screen = screen; ++ } ++ + void Workspace::setDesktopLayout(int o, int x, int y) + { + layoutOrientation = (Qt::Orientation) o; +diff -u -p -N -r kdebase.sav/kwin/workspace.h kdebase/kwin/workspace.h +--- kdebase.sav/kwin/workspace.h 2006-04-13 14:03:15.000000000 +0200 ++++ kdebase/kwin/workspace.h 2006-09-01 13:27:44.000000000 +0200 +@@ -91,6 +91,7 @@ class Workspace : public QObject, public + + QRect clientArea( clientAreaOption, const QPoint& p, int desktop ) const; + QRect clientArea( clientAreaOption, const Client* c ) const; ++ QRect clientArea( clientAreaOption, int screen, int desktop ) const; + + /** + * @internal +@@ -161,6 +162,13 @@ class Workspace : public QObject, public + */ + int numberOfDesktops() const; + void setNumberOfDesktops( int n ); ++ ++ int activeScreen() const; ++ int numScreens() const; ++ void checkActiveScreen( const Client* c ); ++ void setActiveScreenMouse( QPoint mousepos ); ++ QRect screenGeometry( int screen ) const; ++ int screenNumber( QPoint pos ) const; + + QWidget* desktopWidget(); + +@@ -186,6 +194,7 @@ class Workspace : public QObject, public + void sendClientToDesktop( Client* c, int desktop, bool dont_activate ); + void windowToPreviousDesktop( Client* c ); + void windowToNextDesktop( Client* c ); ++ void sendClientToScreen( Client* c, int screen ); + + // KDE4 remove me - and it's also in the DCOP interface :( + void showWindowMenuAt( unsigned long id, int x, int y ); +@@ -222,6 +231,7 @@ class Workspace : public QObject, public + void nextDesktop(); + void previousDesktop(); + void circulateDesktopApplications(); ++ void setCurrentScreen( int new_screen ); + + QString desktopName( int desk ) const; + void setDesktopLayout(int o, int x, int y); +@@ -297,6 +307,10 @@ class Workspace : public QObject, public + //void slotSwitchToWindow( int ); + void slotWindowToDesktop( int ); + //void slotWindowToListPosition( int ); ++ void slotSwitchToScreen( int ); ++ void slotWindowToScreen( int ); ++ void slotSwitchToNextScreen(); ++ void slotWindowToNextScreen(); + + void slotWindowMaximize(); + void slotWindowMaximizeVertical(); +@@ -477,6 +491,7 @@ class Workspace : public QObject, public + int current_desktop; + int number_of_desktops; + QMemArray desktop_focus_chain; ++ int active_screen; + + QWidget* active_popup; + Client* active_popup_client; --- kdebase-3.5.6.orig/debian/patches/28_kdebase_rubberband.diff +++ kdebase-3.5.6/debian/patches/28_kdebase_rubberband.diff @@ -0,0 +1,430 @@ +--- kde.orig/kcontrol/style/kcmstyle.cpp ++++ kde.patched/kcontrol/style/kcmstyle.cpp +@@ -229,6 +229,14 @@ + containerLayout->addWidget( lblTooltipEffect, 1, 0 ); + containerLayout->addWidget( comboTooltipEffect, 1, 1 ); + ++ comboRubberbandEffect = new QComboBox( FALSE, containerFrame ); ++ comboRubberbandEffect->insertItem( i18n("Disable") ); ++ comboRubberbandEffect->insertItem( i18n("Make translucent") ); ++ lblRubberbandEffect = new QLabel( i18n("&Rubberband effect:"), containerFrame ); ++ lblRubberbandEffect->setBuddy( comboRubberbandEffect ); ++ containerLayout->addWidget( lblRubberbandEffect, 2, 0 ); ++ containerLayout->addWidget( comboRubberbandEffect, 2, 1 ); ++ + comboMenuEffect = new QComboBox( FALSE, containerFrame ); + comboMenuEffect->insertItem( i18n("Disable") ); + comboMenuEffect->insertItem( i18n("Animate") ); +@@ -236,8 +244,8 @@ + comboMenuEffect->insertItem( i18n("Make Translucent") ); + lblMenuEffect = new QLabel( i18n("&Menu effect:"), containerFrame ); + lblMenuEffect->setBuddy( comboMenuEffect ); +- containerLayout->addWidget( lblMenuEffect, 2, 0 ); +- containerLayout->addWidget( comboMenuEffect, 2, 1 ); ++ containerLayout->addWidget( lblMenuEffect, 3, 0 ); ++ containerLayout->addWidget( comboMenuEffect, 3, 1 ); + + comboMenuHandle = new QComboBox( FALSE, containerFrame ); + comboMenuHandle->insertItem( i18n("Disable") ); +@@ -245,11 +253,11 @@ + // comboMenuHandle->insertItem( i18n("Enable") ); + lblMenuHandle = new QLabel( i18n("Me&nu tear-off handles:"), containerFrame ); + lblMenuHandle->setBuddy( comboMenuHandle ); +- containerLayout->addWidget( lblMenuHandle, 3, 0 ); +- containerLayout->addWidget( comboMenuHandle, 3, 1 ); ++ containerLayout->addWidget( lblMenuHandle, 4, 0 ); ++ containerLayout->addWidget( comboMenuHandle, 4, 1 ); + + cbMenuShadow = new QCheckBox( i18n("Menu &drop shadow"), containerFrame ); +- containerLayout->addWidget( cbMenuShadow, 4, 0 ); ++ containerLayout->addWidget( cbMenuShadow, 5, 0 ); + + // Push the [label combo] to the left. + comboSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); +@@ -359,6 +367,7 @@ + connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty())); + connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty())); + connect( comboTooltipEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty())); ++ connect( comboRubberbandEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); + connect( comboComboEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty())); + connect( comboMenuEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); + connect( comboMenuHandle, SIGNAL(activated(int)), this, SLOT(setStyleDirty())); +@@ -548,6 +557,11 @@ + item = comboTooltipEffect->currentItem(); + config.writeEntry( "EffectAnimateTooltip", item == 1); + config.writeEntry( "EffectFadeTooltip", item == 2 ); ++ item = comboRubberbandEffect->currentItem(); ++ { ++ QSettings settings; // Only for KStyle stuff ++ settings.writeEntry("/KStyle/Settings/SemiTransparentRubberband", item == 1); ++ } + item = comboMenuHandle->currentItem(); + config.writeEntry( "InsertTearOffHandle", item ); + item = comboMenuEffect->currentItem(); +@@ -916,7 +931,11 @@ + comboTooltipEffect->setCurrentItem( 2 ); + else + comboTooltipEffect->setCurrentItem( 0 ); +- ++ ++ QSettings settings; ++ bool semiTransparentRubberband = settings.readBoolEntry("/KStyle/Settings/SemiTransparentRubberband", false); ++ comboRubberbandEffect->setCurrentItem( semiTransparentRubberband ? 1 : 0 ); ++ + if ( config.readBoolEntry( "EffectAnimateMenu", false) ) + comboMenuEffect->setCurrentItem( 1 ); + else if ( config.readBoolEntry( "EffectFadeMenu", false) ) +@@ -927,7 +946,7 @@ + comboMenuHandle->setCurrentItem(config.readNumEntry("InsertTearOffHandle", 0)); + + // KStyle Menu transparency and drop-shadow options... +- QSettings settings; ++ + QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled"); + + #ifdef HAVE_XRENDER +@@ -1056,6 +1075,8 @@ + QWhatsThis::add( comboTooltipEffect, i18n( "

Disable: do not use any tooltip effects.

\n" + "

Animate: Do some animation.

\n" + "Fade: Fade in tooltips using alpha-blending.") ); ++ QWhatsThis::add( comboRubberbandEffect, i18n( "

Disable: do not use any rubberband effects.

\n" ++ "Make Translucent: Draw a translucent rubberband.") ); + QWhatsThis::add( comboMenuEffect, i18n( "

Disable: do not use any menu effects.

\n" + "

Animate: Do some animation.

\n" + "

Fade: Fade in menus using alpha-blending.

\n" +--- kde.orig/kcontrol/style/kcmstyle.h ++++ kde.patched/kcontrol/style/kcmstyle.h +@@ -125,11 +125,13 @@ + QFrame* containerFrame; + QGridLayout* containerLayout; + QComboBox* comboTooltipEffect; ++ QComboBox* comboRubberbandEffect; + QComboBox* comboComboEffect; + QComboBox* comboMenuEffect; + QComboBox* comboMenuHandle; + + QLabel* lblTooltipEffect; ++ QLabel* lblRubberbandEffect; + QLabel* lblComboEffect; + QLabel* lblMenuEffect; + QLabel* lblMenuHandle; +--- kde.orig/konqueror/listview/konq_listviewwidget.cc ++++ kde.patched/konqueror/listview/konq_listviewwidget.cc +@@ -405,9 +405,11 @@ + { + if ( m_rubber ) + { +- drawRubber(); +- delete m_rubber; +- m_rubber = 0; ++ ++ QRect r( m_rubber->normalize() ); ++ delete m_rubber; ++ m_rubber = 0; ++ repaintContents( r, FALSE ); + } + + delete m_selected; +@@ -417,14 +419,15 @@ + KonqBaseListViewItem* item = isExecuteArea( vp ) ? + static_cast( itemAt( vp ) ) : 0L; + +- if ( item ) ++ if ( item ) { + KListView::contentsMousePressEvent( e ); ++ } + else { + if ( e->button() == LeftButton ) + { +- if ( !( e->state() & ControlButton ) ) +- setSelected( itemAt( vp ), false ); + m_rubber = new QRect( e->x(), e->y(), 0, 0 ); ++ clearSelection(); ++ emit selectionChanged(); + m_fileTip->setItem( 0 ); + } + if ( e->button() != RightButton ) +@@ -440,9 +443,11 @@ + { + if ( m_rubber ) + { +- drawRubber(); ++ ++ QRect r( m_rubber->normalize() ); + delete m_rubber; + m_rubber = 0; ++ repaintContents( r, FALSE ); + } + + if ( m_scrollTimer ) +@@ -534,23 +539,21 @@ + KListView::leaveEvent( e ); + } + +-void KonqBaseListViewWidget::drawRubber() ++void KonqBaseListViewWidget::drawRubber( QPainter *p ) + { + if ( !m_rubber ) + return; + +- QPainter p; +- p.begin( viewport() ); +- p.setRasterOp( NotROP ); +- p.setPen( QPen( color0, 1 ) ); +- p.setBrush( NoBrush ); ++ p->setRasterOp( NotROP ); ++ p->setPen( QPen( color0, 1 ) ); ++ p->setBrush( NoBrush ); + + QPoint pt( m_rubber->x(), m_rubber->y() ); + pt = contentsToViewport( pt ); +- style().drawPrimitive( QStyle::PE_FocusRect, &p, ++ style().drawPrimitive( QStyle::PE_RubberBand, p, + QRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), + colorGroup(), QStyle::Style_Default, colorGroup().base() ); +- p.end(); ++ + } + + void KonqBaseListViewWidget::slotAutoScroll() +@@ -566,10 +569,12 @@ + if ( vc == m_rubber->bottomRight() ) + return; + ++ QRect oldRubber = *m_rubber; ++ + const int oldTop = m_rubber->normalize().top(); + const int oldBottom = m_rubber->normalize().bottom(); + +- drawRubber(); ++ + m_rubber->setBottomRight( vc ); + + QListViewItem *cur = itemAt( QPoint(0,0) ); +@@ -577,12 +582,20 @@ + bool block = signalsBlocked(); + blockSignals( true ); + ++ QRect rr; + QRect nr = m_rubber->normalize(); ++ bool changed = FALSE; ++ + if ( cur ) + { +- QRect rect = itemRect( cur ); +- if ( !allColumnsShowFocus() ) ++ QRect rect; ++ if ( allColumnsShowFocus() ) ++ rect = itemRect( cur ); ++ else { ++ rect = itemRect( cur ); + rect.setWidth( executeArea( cur ) ); ++ } ++ + + rect = QRect( viewportToContents( rect.topLeft() ), + viewportToContents( rect.bottomRight() ) ); +@@ -606,9 +619,26 @@ + if ( rect.intersects( nr ) ) + { + if ( !cur->isSelected() && cur->isSelectable() ) ++ { + setSelected( cur, true ); +- } else if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) +- setSelected( cur, false ); ++ changed = TRUE; ++ rr = rr.unite( itemRect( cur ) ); ++ } ++ } ++ else ++ { ++ if ( cur->isSelected() ) ++ { ++ changed = TRUE; ++ rr = rr.unite( itemRect( cur ) ); ++ } ++ ++ if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) ++ { ++ setSelected( cur, false ); ++ } ++ } ++ + + cur = cur->itemBelow(); + if (cur && !allColumnsShowFocus()) +@@ -625,9 +655,26 @@ + if ( rect.intersects( nr ) ) + { + if ( !cur->isSelected() && cur->isSelectable() ) ++ { + setSelected( cur, true ); +- } else if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) +- setSelected( cur, false ); ++ changed = TRUE; ++ rr = rr.unite( itemRect( cur ) ); ++ } ++ } ++ else ++ { ++ if ( cur->isSelected() ) ++ { ++ changed = TRUE; ++ rr = rr.unite( itemRect( cur ) ); ++ } ++ ++ if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) ++ { ++ setSelected( cur, false ); ++ } ++ } ++ + + cur = cur->itemAbove(); + if (cur && !allColumnsShowFocus()) +@@ -639,7 +686,31 @@ + blockSignals( block ); + emit selectionChanged(); + +- drawRubber(); ++ QRect allRect = oldRubber.normalize(); ++ if ( changed ) ++ { ++ allRect |= rr.normalize(); ++ } ++ allRect |= m_rubber->normalize(); ++ QPoint point = contentsToViewport( allRect.topLeft() ); ++ allRect = QRect( point.x(), point.y(), allRect.width(), allRect.height() ); ++ allRect &= viewport()->rect(); ++ allRect.addCoords( -2, -2, 2, 2 ); ++ ++ QPixmap backrubber( viewport()->rect().size() ); ++ backrubber.fill( viewport(), viewport()->rect().topLeft() ); ++ ++ QPainter p( &backrubber ); ++ p.save(); ++ drawContentsOffset( &p, ++ contentsX(), ++ contentsY(), ++ contentsX() + allRect.left(), contentsY() + allRect.top(), ++ allRect.width(), allRect.height() ); ++ p.restore(); ++ drawRubber( &p ); ++ p.end(); ++ bitBlt( viewport(), allRect.topLeft(), &backrubber, allRect ); + + const int scroll_margin = 40; + ensureVisible( vc.x(), vc.y(), scroll_margin, scroll_margin ); +@@ -669,9 +740,12 @@ + + void KonqBaseListViewWidget::viewportPaintEvent( QPaintEvent *e ) + { +- drawRubber(); ++ + KListView::viewportPaintEvent( e ); +- drawRubber(); ++ ++ QPainter p( viewport() ); ++ drawRubber( &p ); ++ p.end(); + } + + void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e) +--- kde.orig/konqueror/listview/konq_listviewwidget.h ++++ kde.patched/konqueror/listview/konq_listviewwidget.h +@@ -206,7 +206,7 @@ + virtual void viewportPaintEvent( QPaintEvent *e ); + virtual void viewportResizeEvent( QResizeEvent *e ); + +- virtual void drawRubber(); ++ virtual void drawRubber( QPainter * ); + virtual void contentsMousePressEvent( QMouseEvent *e ); + virtual void contentsMouseReleaseEvent( QMouseEvent *e ); + virtual void contentsMouseMoveEvent( QMouseEvent *e ); +@@ -246,7 +246,8 @@ + QColor m_itemColor; + + QRect *m_rubber; +- ++ QPixmap *m_backrubber; ++ + bool m_bTopLevelComplete:1; + bool m_showIcons:1; + bool m_bCaseInsensitive:1; +--- kde.orig/kdesktop/kfileividesktop.cpp ++++ kde.patched/kdesktop/kfileividesktop.cpp +@@ -133,40 +133,11 @@ + return false; + } + +-void KFileIVIDesktop::paintFocus( QPainter *p, const QColorGroup &cg ) +-{ +- if ( !iconView() ) +- return; +- +- if ( !m_shadow || !wordWrap() || +- !( static_cast +- ( m_shadow->shadowSettings() ) )->isEnabled() ) { +- QIconViewItem::paintFocus( p, cg ); +- return; +- } +- +- int spread = shadowThickness(); +- +- iconView()->style().drawPrimitive( QStyle::PE_FocusRect, p, +- QRect( textRect( false ).x(), textRect( false ).y(), +- textRect( false ).width() - spread, +- textRect( false ).height() - spread + 1 ), +- cg, +- isSelected() ? QStyle::Style_FocusAtBorder : QStyle::Style_Default, +- QStyleOption( isSelected() ? cg.highlight() : cg.base() ) ); +- +- if ( this != iconView()->currentItem() ) { +- iconView()->style().drawPrimitive( QStyle::PE_FocusRect, p, +- QRect( pixmapRect( false ).x(), pixmapRect( false ).y(), +- pixmapRect( false ).width(), pixmapRect( false ).height() ), +- cg, QStyle::Style_Default, QStyleOption( cg.base() ) ); +- } +-} + + + void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &cg ) + { +- int textX = textRect( FALSE ).x() + 2; ++ int textX = textRect( FALSE ).x() + 4; + int textY = textRect( FALSE ).y(); + int align = ((KIconView *) iconView())->itemTextPos() == QIconView::Bottom + ? AlignHCenter : AlignAuto; +@@ -182,12 +153,15 @@ + int spread = shadowThickness(); + + if ( isSelected() && settings->selectionType() != KShadowSettings::InverseVideoOnSelection ) { +- // select using a filled rect + text = cg.highlightedText(); + QRect rect = textRect( false ); + rect.setRight( rect.right() - spread ); + rect.setBottom( rect.bottom() - spread + 1 ); +- p->fillRect( rect, cg.highlight() ); ++ p->setBrush( QBrush( cg.highlight() ) ); ++ p->setPen( QPen( cg.highlight() ) ); ++ p->drawRoundRect( rect, ++ 1000 / rect.width(), ++ 1000 / rect.height() ); + } + else { + // use shadow +--- kde.orig/kdesktop/kfileividesktop.h ++++ kde.patched/kdesktop/kfileividesktop.h +@@ -80,12 +80,7 @@ + virtual void paintItem(QPainter *p, const QColorGroup &cg); + + /** +- * Reimplements QIconView::paintFocus() to take the shadow +- * metrics into account(); +- */ +- virtual void paintFocus( QPainter *p, const QColorGroup &cg ); + +- /** + * Draws the shadow text. + * @param p the painter for drawing the item + * @param cg the base color group --- kdebase-3.5.6.orig/debian/patches/kubuntu_81_search_engines_config.diff +++ kdebase-3.5.6/debian/patches/kubuntu_81_search_engines_config.diff @@ -0,0 +1,13 @@ +diff -Nur kdebase-3.5.4/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp kdebase-3.5.4.new/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +--- kdebase-3.5.4/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp 2006-01-19 18:00:46.000000000 +0100 ++++ kdebase-3.5.4.new/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp 2006-09-12 12:05:56.000000000 +0200 +@@ -154,6 +154,9 @@ + this, SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, SIGNAL(spacePressed(QListViewItem *)), + this, SLOT(checkFavoritesChanged())); ++ connect(m_dlg->lvSearchProviders, SIGNAL(clicked(QListViewItem *)), ++ this, SLOT(checkFavoritesChanged())); ++ + + connect(m_dlg->cmbDefaultEngine, SIGNAL(activated(const QString &)), this, + SLOT(configChanged())); --- kdebase-3.5.6.orig/debian/patches/16_kdm_X_path.diff +++ kdebase-3.5.6/debian/patches/16_kdm_X_path.diff @@ -0,0 +1,64 @@ +--- kde.orig/kdm/backend/server.c ++++ kde.patched/kdm/backend/server.c +@@ -41,6 +41,7 @@ + #include + + #include ++#include + #include + + +@@ -94,6 +95,21 @@ + (void)Signal( SIGUSR1, SIG_IGN ); + (void)execv( argv[0], argv ); + LogError( "X server %\"s cannot be executed\n", argv[0] ); ++ ++ /* Let's try again with some standard paths */ ++ argv[0] = (char *)realloc(argv[0], strlen("/usr/X11R6/bin/X") + 1); ++ if (argv[0] != NULL) { ++ argv[0] = "/usr/X11R6/bin/X"; ++ Debug( "exec %\"[s\n", argv ); ++ (void)execv( argv[0], argv ); ++ LogError( "X server %\"s cannot be executed\n", argv[0] ); ++ ++ argv[0] = "/usr/bin/X"; /* Shorter than the previous file name */ ++ Debug( "exec %\"[s\n", argv ); ++ (void)execv( argv[0], argv ); ++ LogError( "X server %\"s cannot be executed\n", argv[0] ); ++ } ++ + exit( 47 ); + case -1: + LogError( "X server fork failed\n" ); +--- kde.orig/kdm/backend/dm.c ++++ kde.patched/kdm/backend/dm.c +@@ -39,6 +39,7 @@ + #include "dm_error.h" + + #include ++#include + #include + #include + #include +@@ -564,6 +565,21 @@ + Debug( "exec %\"[s\n", argv ); + (void)execv( argv[0], argv ); + LogError( "X server %\"s cannot be executed\n", argv[0] ); ++ ++ /* Let's try again with some standard paths */ ++ argv[0] = (char *)realloc(argv[0], strlen("/usr/X11R6/bin/X") + 1); ++ if (argv[0] != NULL) { ++ argv[0] = "/usr/X11R6/bin/X"; ++ Debug( "exec %\"[s\n", argv ); ++ (void)execv( argv[0], argv ); ++ LogError( "X server %\"s cannot be executed\n", argv[0] ); ++ ++ argv[0] = "/usr/bin/X"; /* Shorter than the previous file name */ ++ Debug( "exec %\"[s\n", argv ); ++ (void)execv( argv[0], argv ); ++ LogError( "X server %\"s cannot be executed\n", argv[0] ); ++ } ++ + exit( 1 ); + case -1: + LogError( "Forking X server for remote login failed: %m" ); --- kdebase-3.5.6.orig/debian/patches/kubuntu_87_kicker_restore_description_parents.diff +++ kdebase-3.5.6/debian/patches/kubuntu_87_kicker_restore_description_parents.diff @@ -0,0 +1,12 @@ +diff -Nur kdebase-3.5.6/kicker/kicker/ui/service_mnu.cpp kdebase-3.5.6.new/kicker/kicker/ui/service_mnu.cpp +--- kdebase-3.5.6/kicker/kicker/ui/service_mnu.cpp 2006-10-01 19:31:52.000000000 +0200 ++++ kdebase-3.5.6.new/kicker/kicker/ui/service_mnu.cpp 2007-01-26 02:27:11.000000000 +0100 +@@ -311,7 +311,7 @@ + { + if (comment.find(serviceName, 0, true) == -1) + { +- serviceName = QString("%1 %2").arg(serviceName, comment); ++ serviceName = QString("%1 (%2)").arg(serviceName, comment); + } + else + { --- kdebase-3.5.6.orig/debian/patches/21_default_background_image.diff.uu +++ kdebase-3.5.6/debian/patches/21_default_background_image.diff.uu @@ -0,0 +1,2062 @@ +begin 644 21_default_background_image.diff +M+2TM(&MD92YO:-]N<.6B/JAQI3$!B1!BK*E+T_>'1$VQ198``$L_/_^__X?`N:# +MB.N_B>CP.T0Z?'[YG*\MSOOVGP_]O#P**XYMF'U:?K=_E^TS@-KYKK4=`L"( +M0#`7>]#<\7]C.VQ[0W?W+J^1T3.]^T_ZVK+NM[, +M/D^K`$!`AS[9]MRA#1U>)UH6B-$7U[B6GS5"TF-]'ZFT[V7^K=:C&)_1`$"8 +M-I^A_9DS'TXY)C3'+:P/1WY(]),CSZ3[Q/V>4BI:[KGD/Q!?+_G;UV%%2`!$ +M6&SN;=]3C/DDCA('3#OT@H_D^?/J)]_G$0"8NC>F+ZZ]YL.4)>42%T=(R@83 +M"^S7IW\^GX>&O.#.":P(B+03,-J$3"QX#X/8X^>T!8R:X-*U(#8PB(J"GS// +M?!P`/[896D"8SPQG#&9;[GG#@^3>;QC.P:FAU/=SPWV?$W@'!!=+8`!9YWH/ +MGDS`AHCKE/OZ0!NS(-TH`0#0-F65*@R9>X$C@$ON&:Z1N']&VUS9='@EY>M: +M4RZX254X+8+T,XV!EMK46LOTR0'<4_0T('EUB0_\EICOS1CW"BOT\#N"\(D^ +M'[B7!O@":@MQW^HS$,YT^![S'Z&?NVMAP01^C/$/>4*(Q"$X7(<,!0B[0 +MXP/Q>["D`#>09_F;Z_U>H<$!/)1F2=K^SO&2VUX:`NQN\$Y>'!9:,RZH+R%` +M4,#JYPHK`B?XQX`GQUC3S?\R7.!DU3I^@.S\M\4(2)X7!F@@S[FI)7R+&@4` +MAQGEWCC%`G#7O-F\KK&*D+->L>!*TK-<&YQS;N$DYR&U;2F@:P/N(1T<`]P9 +MJLMJB$AZW,FBTVVWV*E]OPHK*,_1M1S@GJN#N3>/->3$P?&EM=B9X\[WP>.> +MZHDZ@B:>%R\,'GF`C*UP@`X>]Y@-P@&$KL_YOI_B^;*U-WW/[LV,'AO%"<&6 +M/6.^6XI:@C+'F#B&RN1[9M??8?R\GF&07>FY0ZA4-E?'L] +MQH&7HC^XSWVU"+Q0FP@L;"8?* +MZ?>`]UAL?.J"+DD1$JY?M%T?:@7[;G,-90C_U\#6]ECG>I-FB0:LMV:RGI`2P=!I-BK"!@6CP[ +M]S.)2\HZ\X`LJ]Y^V\BY>48HZ>R52G;,/2^$B5QZA +M;8P+)NA3.W84:"0FE&K`QEA0FVHXQ!@Y$OWGA,GXA)_YM=@QU=CD66MN`5W? +MG'17^GS%7J?ZOO?>3U1%)M2413E@OF0?^#DVG[N'6Y9GTGOM.U?9KBCPY-DH +M"BODZ5[LJS_>4!ENZ,#[V%,6:*\E'',$<@B`X^RUYKXO]_T<(,]N*T)1EUJK +MEN/:[D<>O.\!HCN/XWY:6[]O`^_?].ZVQEC9<&T0U8J>Q1NT7Q^X^RJSQ`'8 +M[8[@9)_'O*\%P9@+P"4].#X`G^PI0Y[(\M6\OY_[L<75<_8?9Y^W<,1*% +M+25TT5+)DI.3$/*0+*W@X,7F2Q#4<81F;A.M-P,3-"W:_1W85&#+;HGV[ +M[Y^1WIZEI?[8I*Q:H+Y3P$$ +M,02`-9/=I,F<.'VUN620RO:?5<:8F[/".6Z8<.21+R^2U@T+&MC&_S=S@&B= +M(#Q^VE$&>KLFR[_PH)=*EJ[?MHT;';BD*,=.YQ4CA^_L\7.-G%7@GI;TZ&RSZ#/WD"8F;;18:0(O&(<:W":CHOKQOOXZR):.80B)9.V8LMG?6OBW*<( +MH=`:9H5^6?9+*26S=S;$W"9)[N4;O.?)G=(A2/=SKK'P^2M0EYSH?LYY>DGZ +MUE3P)^%5V5K0X3KMNS^R;,K8^/Q2AD(**^@N`2X,J +M*SLB>^^5C2TM%3]=,KSC2J`@UEE28FPI\?*M`/TSBQ6P]^,M3K=GDT.U?3_7 +M!>YG@+":AYSGM4ZO-^H2R%)>Z5`5FQ*>Y]9!>PU%>S_G@W=7R#6O^V7Z>V-4Z_D_J_#'_10&[K9D1U<"`X>, +M(N;WRV.RS[EB$FN$1@1#8"BNC10`O/TY+3'4RN97J6(`AVBK-/AS&D\4'MN9 +ME4NX[*TI9V6S5R()*V(2(>VA;^3=@&N".V&8=0\U0WOQR%B`E,AYX.4NI!=/ +MYNR)7/;1'+(43ANQAD4+C*LIW[.QA^XD3XD2T)O&=H-:(`[^O\+Y"7=Y^R +M>Y\H#$'0ZWYL3+)*6N[:IA#;W<]G/L8/H`1KU3(1TG%.UWFD,<'P:_3I`R49?\UMR^=Q=WW^ +M$\!:S9"A4KD+)<;P33'OAWC&#]C37)Z'!G6]?7WP#==;'(Z+O?9^/@N,?@4+ +M*T=F"BNUT_8LW&>YY#DI'>['`NY3VWN/$(EL8]'*,:8&!%ZM=S8`Q;,VR3+7 +M&&6U*6<+E@F]O`,YESG%7[OQCP#M=^VQ)/_V!-N_`X;++")SW+S;`FV98P`S"9A5H68N_;1/%#*%UI)PDK*I +M;$RA,99DJ8H**]QX^Y#0LB5PV@`O20Q?\#)KX'L2D-[O +M)2_H7,=MJ:9BYVVT@01_++P]M$D5M;;3P`Q:$,%69A`1*`8@\`&+4HG4L4RW +M+2FP*RCC9&X**\J`PWLYC?&RT=WW+@BJV'.U"BM-'`/H`B_")GZ$ +MT;OV'8-61XRNLFT0],KT"S"(4DC*8G:^5(EJ>!*1)?N]M#"0F\GNYOKUDF"\ +MM@#E)**VKCCRX]BQ>!A="BOX;B7'X).O"P^A):(>CC2V7KO!<7MT4MZQE*3/ +M%H3;)X.CK<4N>*/(!`U3^`H0PP +MVOPU(Z)XV<74T`SK30"=EY&^K^K0V +M)\<-V._G-.">J_12JL>4",&)"94Y&`%(P=`:1'961@HKO)WM;79G385C?5.=.2GG +MJWS(Z2[_A4C+7GS,DWD2]\0ZW^;WF:G8>5]77^#V<@;_R' +MB>.S&B_W'A)5V&?^=?Q92 +MOGNKI79THFW]^M3&8D$3%YCOJ>E+>Y`Q)P,H65ABEF&R_3RRYMKG2>`:%Z6) +ME>[G>N":1ZC6IB9@>2!YZ&.J>!#PUK%N)RTW>RWFY%R1$OW,=H[5P&YY^8^V_"\`C8CC&/22TPAC0%]Z&$G9,)E:0-2GI+GQS=+C"X'Y&[#?3VE%\XF*_=J^7[F2";DT27"^Y3 +M")]RC:.086G[GD_X$>XVIB8O>4**$.:63W1^!@`Z8T=,U5R.#*.^^NK+WS2F +MTX,?O'8&V9A_+?=].1Z\X]B//`9H@476.<-POY`4[+-3;4WQR*,HN*[HX:'9 +M_'BR/5W:\"KI,$AN>R:[B]W_0&F@'$$V1RHE\53R1C:UE"LJJKRWMXN6<][H +M(&,LO"OS>'VZ-OHF'P&(-+RS*<@K5S>[;DZH588.64Y#LC7C.E?OC]7/^I[=6ML7=R]F@)0JMO`(9->N\_"BM87_M] +MM?AGI`WZRQB@7ZJK3@?N4H#=5G<\!(BYUWCY8%O>6"AAK.2.,SG$Z42E$IN0 +M>`/X[P+@B9TZ38/%QJ-:":UN[7LK^JN?P?M)E@DW;O_NI\\Y^"4$5>D:M:T* +M*U.ND>-2Z"$0WSJ#K*OOJ=[VEL'[;5C4!R"<4)G2ZY*S1^\]\WU[^QO7VUTS +M_7X29]3Z&_&`G%LVU07NDA[>_76/+%2(D49%V.=YR( +MK''&J94K4_),,>,VOMR:FE#VUK8QM^W<`!B`&TL2"XM2&)!>50_D&=0B+V/,4:7`<`M5]6Z,/X:/TQ@ +MSLEW[Z6H?2EW#)B7&/M0HK.>R%900`B0'HD+4G">!S +MO2\EU;F@ANDNK[WQ3USC.\[JZ_Y2B^E/?EK-'5O=4W@/?/AW38 +M2BIX+VG$W7LV39ZT/.^Y%:@V/S.'1XG]N@%/VWTJ92B7-O)OW/Z=CQNX6^*! +M94[3L18Y,@_3/N:/Q=YJ$<[K&PW2I6TOCI?MG)C@-_?35#MU>^03?;ANL3V/LUK +MN_X9]_-HMD8>"2LSQ[ZXZ>/;WR1F3F.8?/O&K"&\JR>\FTQR7,@=^K5OCBS? +M.4SZKJ,46H?PB:.TR=^,\2@['"$WEJOM=8B;C;4E6;&20A%L\3O&UGG +M#.'=7IQ50S_D\OM*Z[\VQ&V40E"#:5@PWY]*R)<3Q#G(V#^W9"=&^+O3^ +M.RY43NB8MO=FFX[`^GUT]N'PU7E?KE]5CO5$Q@'&O?Y[OV4E%T3+[#D6BXSW +M;]XL1\X(`T?)"B]SE>NISSUPV&VJEQ`W7>WT)0K%@@@YA3O.: +MSP@)=P+9L-$,!'\4,NC1V;@!/12`"BORQ%H;8;XWF"&\QA%FLQ\-D3U>GEQM +MX@[!^B;="BN*]OLJ0F'C`OPBJSZ9#@B7;'/ET.[;HFU2O=GRDMA.GB4)*FMB +M34/T7C3/ED_6(+GW#7KZB+;S9],5#JPK91Q[\X*0,:%LD($;!N!53VPWQOR] +M\'DFJUV]+T"ZEY/D'QNZQKI]"_HM1;NN#KJ94LPK0?BYEF^UC`[C]Y(H>`?A +MF[02;?IDF$?V;'['+$.>;4L@`XNB9[<:SDE?H0)$?`-W+OC.`>W<25L@5,D2 +MDBG`42)Y-F4\L01+L?.]W^AW(N=U'JY!>86UQ0HK9[BU]8E9K]9+0MYQXN5U +M01MS6G8/GEVAYJYY?TT]Z%NGJY?3W8^O3TT$325&XAD%R/+FG,'B&38ZW`FJ +ML>_BKHU4C'N)BC3W<[[02A5<-1,2$8'E<>3(@=8$M#HD>S3?0;;V1MY^W'Q_*XIY;ZL[9)<9,8^[D2M:'? +M;8^;6#C?DN1LDA2/>RYHOX+PO!__GH_UOGO;OJ?W%&/*1M)D4TY7+<_XZ8#' +MQRWR*:#YAJRW`7VO1T(?,\:S_[GW70OY&#==2B28(!CHONM]=J\P(_YKCKOR +M62\Y8,CU/H[%[O/$20!GU[K$*-C:MQJI7N&0)Y8;?QM[36N["3';B7EO;']3 +MQQR:<]^879\-M1GZ'F6L=RY@].UUWS+X]EXJ(RJW+9?H:ATT_])('P^6I/ZL6\5I%04C02(VC!FE2C;9K'KI<"_6*UGRI +M]^:T6XJE$6/0.]BJJNSVE=!\Q"BJ$OOZZEZFJX"\;QQS#FAOA5#O;%![Y7.8 +M`D[I@\X@770,AZHR,0>:$[)A__VN\&+A!$\4&-_[9PHK?@W^4![6?#NWEG$#U +M^R+EI<_I[UX7QI1S+7'V[M#2Z^F@JZR9+0HKI,\]T-$@G]'V/C$U&@!DQ,^' +MO>&+@$"C%!UN?U\`L,=^3A+`7T&!27MB6CJLDX)HLX)&*(PC)3&S+>'^#I$QYZ1?045^?G=EU8O.:4"^^TR3Q<&M#%`".G83RI_[9AJG&0+$I3=B%*` +M;D^T<"&[\28NTWORHH."2+*F8:GQA1NG'D)@#X+% +M;)Y<``*/'D&WG##;0]9>VJ^]+3P1-?&.(`?S,3RQ;'DGQG1TE!\EO>O<[^4D +MBYK?QZ/W*$=`PK&8@X6=<+^WT4Z'&EI"99%UOD(6\?L%+3B>DGQ,B&K3+YV0 +MUNU*FE<[PF9"GCE%`0)*Y]YQZ2L/:WB4?J`WNRPZY,&8E>@HKXC44 +M&.(>E[C6QADJ<\S>]]>"B8MQ#W_.=5KW(3/WP$9KQ]4C(N +M5WJMSB;-D*B^4VK_\)3M)R\YFF<36G8.DY\3%+Q]1?_A2@_DD`YWY. +M6`-@L`/<.52?]?#KBC3Q*!XX+G/5ZSXX\:$?2XFH=&L]K?]7\,C>3[E]W,H: +M2(^OY:W#JG;E_`^]WL!%CIC_2?69VV_).6'5SP_.7:.@':=]:OZW[_R51&!: +MD8*2;.A!#2; +M/%KD>VM*C-<'S4@P2[]:*96;(/]]N="WR""=+*?7)STV;!/"`$6\]@D-RAY!;'^/2G9CQ[2<-.^IS>U]KM@JCT/L@5I6M5B=?HEUG%)B;. +M%T^L"2A)`BCAW*CB#+O%E>A\2L:TEZ19.1A+1/[D5)\5GI),R9\%R+[U]\67 +M)]>HI[1-DNHMS_6R2ZR)[W8B=Q-6;^.6?%\!2)`8:X]M)DQ]0Y%S,5F$UQA? +M\KZJF'R+:`\A^W2#U\[:RR\'^2F$?SG2ZE:K=?8IFSDU%Z2VI!1J$1;53D2U +MO3,V'"-6F1PHYIG74(?PCPPP?:BW[ELG^A8A@T4,I1)G\O:`M[-C@A4T!,_- +MG7?S749TJ:>%)&N;)_0:9QX3*M7?3TO@O?=>%SC*(N6`8T3:)0UMF4=Q+L(,%';J./G]GB>)M:DE60)8/KWGMG6_/*R3=XA?P1D)'#: +M2)9\^012\7I6H@ZR"]=U[#L.,G?C-G&\KS9C3O3^=]L>*-4QQD1!A9J:#Y"J +ML,DNM+;=1?*>FQ0**_/0>>>1G\3UQP4B7.\[['NTD^D@<\N5!$7AA9ZD3XPI +M6R.D@?4Y/)Y+HCU7R9X`:7MN8RH@(GD^2N1L3+(TI=::]=G0.?%541):U/>J +M$$6?YXU.4(9"(Z6@'O=]@6Q+=( +MBJE6J.H<9H<]A2*IM(GQS)L)*M9VSRW)HJ +M@$MLQ'UO;`)O2OWWDD=02IG5JF6=8C!))!G%ULV.K:(2_"Q*K@U!:I!$+N7[ +MM95D6<`HF1_R36$K4G'@)?MS]KJ<06@58XB?7?CB?NZG&>`>>TAB`&1JZ2J, +MJ&+#?3<:5X[;Z\CX9%'NF'-BW'T**U9"@'VBX,L!-U(`,-2'??A#:@E$MV]% +M,O93,KJY?3#7J@&02J3D`H>Y)4WSQI+C(LCOD_1Y:\VX:.%]+@<7+Y061=

XX^40(V.JB:#I^/!>Y7!'^QX3VX!-13')!.F8\2U63D:P+S0C(N"_HM)2@E +MV26O`E"O+/BDP':S"BN9S@4S:1FPZ71I7]7W= +M8N2[@3LG&2N)J`GB?3)[;[@)PM[`3,:3D'*E&3,7N4FMW-"F0W*-(*$&)SY_ +M3X)#1*"42O8**^[?HE`8\BW@"I[!Y)V:LEN0#L-[5A@CHSMR66 +M<319]V;NV?3_4DC41.1$AC[D&ENLL>WD%7??U0HK._M4!T0? +MFHBXC4)679DZ'L[/J77C4^/::ROLU*OG99UKQ7;>-6=C +MS62=`L1^T;VYKH7<,,V7$82P'/B_#@`'T4R_1D5:N@<:[;6->LW +MRKOBQE!E;T?L[4Y+2H[3=]P+R1/F,_V[]-%GX(P8W)S02-S56;XA.7/>:+NC +M;7KQS#"9.VQ.YJQ>>0[[F"22W.MF-&H&!Y,^26:17$;#^K<(T"Y)KE2Z8@RF +MQ;R(59;AU/.>YK]>O?O;Y?Y]0O-Z2DXNV;Q5P-_B'CTC!(.[7A(>=[P][K(J +M0X#=/4>6W>#]NY\^11"X]0VY]_9^(:0A0Q^7J]/CWPQV"62M_^C_0A_G@00:.@DL7]@1`V[U`9%1:I[?'@]`Y +M,VRXL]*7!&(36Q.(47TB/A;$2$N&[+;>X=RE64=LDG&1^;/K7;3*L*K[PN9( +M.'`;R'J0Y0PM!*L@/LC;FF?'\E*T[7L**V_NY(I-:HD1]`EE`?P0D6@9%K&O;;(DM?*83-U,L`CQI#JA_<[[GELO^7Z#*$?0Y0M7]#IX +MP"!8S0)4E&P^V\&9$ +M4Z;N]MLB1ZV\['O@)0G*.3):)3HH&@7N:0?*7B?]T&;D=:`[SKY>#6+)L)>X +M&'>TY@2DC/%*WA1;!9=O3#:4$OB?,#:N,HE1.-^V3\[:'U(E;$L2\#2Y)P@^ +M:HS2E41NG9`Z>7"'C%[\Z7/`8`HK`.>"\W#[]MUWB.T3'$\MP!Z5=P!Q]>9+ +M),#&E$.,%RU!'!,OO];,-R3-70Y+9HX_S0")3=KZ-B/P[/&>7=7E6X'M%8P.*2/Z +MU@F?\.CV]BRT>3G1LPX8@C4M$LW1<0580>9/U_N0"6Y\I#Q5&-L2`?HA5I<) +M_L]4J+8Y=1$4Y8"4;0RB[7>\\`HKW^]BF%=3JTE(>WQ$%)TE\HV[S])9B!DE +M%1GS%EHK;ERR%'B."_>I#]Y3R9U*RTTI@JT;F)=_.)7&1'5_1#\DSD^.7O&] +M2S(D:'6&D:Q\\.:%77O7GH(%0_N7554&/0E3.RS.LF!=W#1-4 +MFVP)'`91C$%0FW(XURH_$_#8DA:Y54.D/2$Q7IC[.0]8'+U*M(5S4N]Y70OL`XN9\R^N5\*$I"G^'B52'@CMM*=V?BI@UP9WT0Y6IW[T%[ +M"+&Z`?QV$25CVF,`>^FV@M\'7MFRE@3Y:2#48\BE]$G*$+$)Z=0RG"FE"BLE +M,21E$+UGSYU8`J2^[/,0VEQG:#^[;GX?OB]Z6X/.39 +ML4*&5&T'2'_6!O-WV#_Q^_A3:>;1&&^V=")J]+OH.L+H;.:WZ7TH;E!(52KY +M!`%]WPS/J4.'1.7>CE;VACX$.3G,KQ/KW[^SY)DI;<@WCO +M6TZR:JH0"241VI)[,,)0--?:UI::$P)HGC>-`*2-SRVE)^'8KY60A_S&HFT< +MH7`6>)J!E=Q(RKD?WH\.BA3"Z:K4U4:(@$M"D5KW,K,O4FN& +MBH+C0GC/50T%AZKKV.X[]@$J0HK,FGN6_-^VN?K]JU]XEFZG_MI +MZ1RYR!*C`:I'8I%I75STMD52YO32;'0R9;88H#WAG;F)I]P0&C&O"*49*U)_ +MS_G>IU[I7JX"2>%;%,X[4VNRMRY8/RETH=3^;C5D+Z5_B&'/(4%'@;[FO:4$K7TLM`*DEA7O\6:`KNH$FOO_G?3Q\6.]Y6C< +M

M7!'=@%>;7D +M;[`AG@O?VA6'JV(YC0BP[1MLZ'F^].*$R;=;ZI94A:Y9_O^[XRB:[$W=`X-GMSJJTW'^%CLG/LO''9=R6N +M>ELH2U7Z?;EA-[;O^0Q^3ONN9&*)BD22[*;K->^F?4LI29`I@YH:EF65V8DZ +M@XY4OJRF:C,B2KZKY&W)6?7Z)<"?!/-TKCRR]<%7C$"J\$,8T9$(PS3W.QSY +MR$H**R;N",,.&*ILNTM4GO,"=U>BDR_6FLO@R0M+(:]0?X?*Y!VZV)`9*>\] +M,M_/S=B6$KHN@ZF&=>[,M)\5[YEE)$/"B1NZE%(G/K6V?$D!]]\W,])=21>'7=T +M"WPIXU]:38VH;"IQ$WG;UN]WQ&R#XJ=T8D]G\[H!V8I("7+1!R/Q_Q +M<,!VUV3/^:$R08'/C_/D`6?ROH\;TI!3^I$3EI+KP[<7K@C><_;&5['F(85E2&+M[OLI#R)394QIEME4.7R5L]=FO'YJWL>;N(".'T+S]P*)E&2^81O/OL;:[^IN +M<;SR/J]G4CUVA$W0%)K?;_C&8_3+=,Q_CJ\F:SCP6VE%YP$AK,IU[PIY_DRVD?_K5!( +MV;EB39WSM2:8!@[S(BO!PXQ'Z3=X!P(T"),FV?B7<'=.^7UPCVO)7>&B]TWL +M+,)$[N>K%N!:(\2=G(&LL)C4V/NR8)Y8.H#73VV96YK/JW/3&N];9(M,Z>/4 +M?`_7GMCL!7"<A:0IN.YM^:]&)W'!;'L@LQQLP:./JVS.E>P +MA3W@4G'P"``**U1XM>DHUVR8BZH8ST:,.^Z"TVULI9O$4[(<5)(1*-8Z[3L[ +M(2:F.\6;'5_2D0Z+BA[0[OU%9'_EB;/VP"'#A94)`#?"[X!9]GL4K0?ZH%/G +M0TV[O62*E267#Q/`>ZK2E?(HF;=3U[R9<"UB["T4K3=1V0E!#+<5U9XW2T+1 +MP7"<:LI8!D'19SHF=X>L#ARR_NP6]BF+0UEBRMY4?OUFS)"7[?J4X_=0>.(I +M<2;>SA9VR'+%2<=FUSK@5"+8LA<[DQ@56S*\%:XE6@,)I*IS$3L$"QG;@>Q` +M(FD>!(&[%31[8OM2O>EQ,>U@)1_*L80Y?8GO+Q7MSQG>E*N42:L1^^V[Q0E5 +M!HAA\DVM,A`R@F/Z+K5?0L;*=X7_Y.UK7QC>F3)@J3)&%H7F4H6YB?)77<=L +M-1U)_E=G'(+O$RKM8"$C)5<&\XUKB^4 +M[7["\UC2E_..0'R7443C0GS)0I#,F6E5.<88ZR4-U5+STX*>N)\;O+-K/-[/ +M&[C;#O(!3,(Q035%<*>68RQ1%D\B;&9*GBSG=>=X6Q%0C-XWM0[S60HKM7:I +MRM*`7P*`V]Y=.Z&(VZ_[X>V!$OM=(4*G%"BE0&L`K:=(U'?NT#N&GX"2\S". +M3AEF$;8/\)Y*\V&4/S^VY'!R%*)H;6V.Y2>);#'3=W*[_)[AQ!_IW=S[/._7 +M,^"K`W>;<-%:6\F";!WW%?&W&0(N8+,EQ3DF*2JEK,#-!7Y#5_8YA!ONV$U( +M#BOBD!7D$$JT4DTBA>AAO]XY8]_'X:8`:==\XX:-;/<56AE:4PU",_DJ9LU]R:@YMR$+UX1/MBUM:2*@<030^KAO`0^Y +M+G,J=]:>GOK%B_M.#1'CM%6K_GSN&`CLR[S<6HF@TIPH-^+V(GWM.2G2[ZGSEQP7_P99R`-.=(=< +M`#3%^[&N^9Y$42TD->;O[[7+!NXE/1.\)%%(KE23"BO@?6$Z,7VPA17%OM^G +MT--C1J]3DU@**^"9;4UD3EB\[RF>)\ERD))`)C7.OB38EC8`SGXZI:#K%#Q? +M@]<[URD$I11T:O)6J1V3\S",\#<,H'6]4J!IZWDS95[-&$EY%TMW":HD*CQ> +M*5E;"U![;[<+HX&CC+9$62!N*A3>$90"P-U:U[VBU]V\TDYM0YI<*67,J8FH +MG!N`VVN0(L#JDRF4](#48+5=C9Z,1%<;V);JUU7W=]\I>/0==$K!,(Z3QQP7 +M[@8`I1`4JOE_W>L\C"/\O4;06B?TXQU>@_#VY!-,X9*:R&D(A$)R6I);^$'5 +M1KB>[/1YMX6;A.O9G[WN$PX,K2N>3N94^J:P%=?5':X+G,,`PCAO9 +M$=/_-^$:S:"=0*DI].;Q>``!P?,UP#!J@]!I)K):ZC(;N0,$6^]:UMPE_LT* +M*]8^!*2G.HRV0BS4IN5[B%N_!W.+;=PD1F+RNHN<;<4D+M)[,YNUQJV*!G=M +MD\-@J;UC9'W@(3E`KO%N])VLSC!E\HJ1EKWUSH(/QJ:C9:[:4,]UG8(]6D(( +M,#`M>242M66C(J26?XP1?G']-F/F:`G)6O^]$"TAX(;IE7R;U\E:A8QYIDPU +MAL*;-!W0O1,$XRQW7Y*J`CQ8]T1D318^)#'OU/N(1\96.B34U%/0N>_,;3^W +M!C?7(YC"!FA]%]G`VK+I]/O$H=JTGWL=[AJGFCWL??<&[/LQQY0U'<817J,& +M!("?OI_;Q`TE%!&!GH&Y)@+29(]IG[]$,_`9-8`F#<,X>=S7L[94'-FC+5,F +MXCM0L.\ZZ+OI-F'4.OHJ7/GD%47N06)`>90_4R7.:LO,[618G42D_/-- +MO,0_PGV-FC"`L^X^S1UEOH@`N6>>,@E)-#KAG +MQD]S0DZX0)IC@*:&N$2'U:!;<"Q7RGM0B`D5CI!!L%%+<9100K6N!5T_"[UH +M4VDC96RY\W'V%6])#U#-/5/3J[:`];Y3PNUVT'==O+E-4XG'18%J33.HGD)B +M].Q]EPF](.C[Z79!$\$X:AC&WT\1>1[6N_5"*)"NEZ[@X`!?7BPL0W@0[_W2A$JQAHOU'<@7QJF5:O;Y`%<5B*E@U!4:2:>HCF30;$V= +M32$]2KT35UV&*```=.O_`Z()Q(\.S[I"A)^^!^K>GQOU&^C?3SJZ>.<[:H_1\?0HKY3;$*N$W:5)X;W&K +MICSZ#OI>11.N^61+B?N>QOO//MN_)]<0A`BBPA_+LG3SFYT:MI_]& +M.^C/,<9+)VB7_%ZXK4GOOG4N;]_8Y!DWC7?O32>+,D1&:P2"Y%B['L1P=QS[ +M\`8`E)'(SJW&14!.0R#5X9:ZY^4KN?'UKZA^H3`8EO#*N]>'#OAP"BM$U('O +M\_9L+RU<1$HJ4AF!ERM4.<11$`3M]B2T](1?._B]M`U?$+RSA!:F`_]+^.<$ +MF21S!'#J>G*^%P3X%KN;FR.!"*!P"BN'Z3LU"63D]WG#+>"1$R5#OM[8I+Q3 +MA/.93JGIIJ*?PVV&.4%6:Z]ZK>GI;`^TV]"*YVTOXKE +M6%72ER4K:IW5A@\.4Y$=\_X-%8RS8<6X<\,Z4BNX6+^W4VHU8MP/"^%I8UMY +M"BNMW[-9T?*"'HL**PC[S0HK?,QC#>D!N43)DB%*I=<]Y;8@Y[JYM?U@`^R= +M4O#H^Y4(*<5S4U.A7_$=RRW&H^_6T)O7,*XQ\5?90[7::I'O@Y#G<8="8/&L +M>;@ZQ\3]E),#4S%BF7W9I\97VZ%N6LC'X7-HCR%WM251#<=*.@443>I$EGC^ +MX^?2/24WH4EYH'I0`(0`!9.F:NZ@><;AGM$M0/5:2(+F*\3X0U+N]K1%60H65L5#-'!W&!MZP^AV3!M"T]#W7:RZP'9.$ +MXK+6$``4&BDVM#"XXL;[#X%2H608+3E7=G'?)5Z>,LMR9>QFM,<&'_L?-J!H +M]T(R2/JV)><@N/:Q-=9=X'4]]`:!!QTF!F&$B93)_PYW(G(I<"35OL]X=R;V +M!A(NS>_:$E.Y%:VXE8HV<>6,(,?ELTH9#*><>'H``$TK>##E`3'F>Q,7NZE_ +M;5\3C7)*!RT`RN8]!9],(K=4?(^-3(AU."@8N:>G6O8`CWX"[\,PE;BL;5R4 +MC7LGX)#=@4$\9)!0QKMW4(YG%FD'9G9UWU<,9[#^^^RR +MSR5ZBCD34NWM8^]K5FN0)="H=>@HZ]Q$O2FBLD')MKCD4SGK7EMP*D3H'ST\ +M.I5]EJYV78Y8'^253FA]#:,U#K[%?M=ZYY4KC;6:`W2#]VN;MH?P`2.*&0'- +M:KGM`7>Y0^4WJVR`.*7B2PHK$VH.:.?\>_O=+?@MGO$OVB96/>@^!E2)=HLF +MT3(!3XN",N>:TGG@\>AC' +M$9XO?PC-><"3BB[-U4L"WZ#4)F'RG0DW>/<,)KSP:P7.4@2Q@4N`MMR4UXW0.D$!MB,Z``CPHKY9!%Y>-HL=,E@U/0F2[THSO$Q>*:]\_>14ON$1DR`TCP$J4-8P:GL/@#*%!1.B[J7*-4@AJJ21$`'I>PZF:C7XG@3)"/\^:KY:- +MJE).A!1YNM4WQ-Q7DT`IT7^7'-P6;.#K,->_8^?1M==3YJ_T_DC%J;&$@F?Q +M!O2I@L06X[Y7@"D@VO0TI(35<`3H4?$>:]"GQ+BG@/#LF-K:PG>>K[.)+F*M +MY:"Q>#^'(^&;HJN!C$??P4_?@U)UUGZM$('R\X7`2^ZS#Q.#10-*@;0SVS1C +MX(=QA&'4[[FG:6I^[R;T08`DS4U%-,>*FEGGD(,,)[RQX?>?%'7&+BU4VO3:8?"65KV +M./@L8\DJ*%^CK"+W[)ECP*5,8-^=DC1J\[CSZE&7O44K>?,D'5)9TBB0:*E3 +M"BM4I]*KUUA)37:;`2Y64C@2=%W9XWX#]MNH.&O]W^4@3?:;O>R8_^67&;B- +MZ%TT$-$.T,J`4#..VI1ZVYAHV%17GLI*;D>VOQ(-Q=:_F6%Q/]`@:%\6&=\- +M38MN,X(`-I]#AU(G`%8(3RY879AA-V0LEC[19B_1\6^[?WD/!+QO0];?+VW3 +MY-%\]^\8&F"/\=V]?[,(MMV8([3/P=SH_,FIDV'R?XJM/?%B+R> +MUT1YD`S:L^DI+K.7,XUR#G#3+V*2MUF&3=!&O<4LK4X[US +M)VQV!!T`KVU!T#-G^U+O7F&,L<+[F%CWSDDC>-=5WRJJ??UY9!#EO@T#FY3D +M'?T%W&Z,)LN(0@15D]"F()-IKH=MD^"W,8@L,>][6&G)I^-VX=VVY908T\X) +M4[*:#]9$0V1YDG$/+3EY!82&'BLMS-<(**\.)HIWCSGS +MUGYXF#^CN-Z(T14ZEBXNLAY@2XRDW5H1*\V?J\=\^6C6[QE[VR;_K7J"R--K +M%]W/(TC/V]^V515BNR54XPIU#=[?**"4[R#`&B-UP`TF +M;O`5X6[_T-$Q%_=22>9[H':,@C/Z$`(-G,224&RW*$MK84]DC?CR4#69&(],2M+/%'.LO%[VZSQX +M.@C^MAK@N<_O8U*C)GB?DJ#SUJYTV%2+\BJW+8FDP5`5N!IZZG[:D<%Y0U.)5O"^#9\X!X!LPF@N#'NL8`C5L#%L%FF@*<,)8/L$XD`[1*JFGOA7`W\Z!"BO` +MG0UP$XF-N,1)28`;CJ4>4]O/+07I^UX.`&RA$@#7`UW+V^Y+JLXQ'EKQME]5 +M88:J^<2LS<]C*O%X%1V@I,B_R')13AS@=^_5O,?-W8`(\-]/!PHK"9[#%/O\ +M&D;X>?3PZ!_>^O'?#-:D>"=L3I25#,MC&BT%0%$Y$A`. +ML;$RFIWCK>80K7#_QA%TW#G3#*\/EQPG99U]'L%2)`LVC^/RG[2ADJ.,:GL< +M4]^7\CW7>;#=`'&(KQ`1%"(\'MW;RTYN,!7A3Q!5L"P2K\)K6FO_Q)[CV/#* +M7)E97VJ="=I) +M`'2-U4P**RLE[/NN@Y]'Y_>RRY8GN)^+&!3->,.Z#CJEX/D:X#5J^'L-H!3" +M?S\/&$8-?Z\7C..]/\^24]^^/U/GK@8'Q'T3P9N/*.;4:(]X9"(JQX-B5CCA +MO-OTM\>&NJ1XSD-&R1[@U%*,4EYM;AQ][$&,!>^)LP4^%C1I$)OSV,I_44%! +M=ZR:P">9"BN!=Y'^P42<\_/H-MZ(RSU4[HR?#:23#>H/-`(0$?[[_8&'UO#W +M'.#O.8#Z1>@[!5WW"Z_7`,]A+&+@IH9L7LGX2_&2GS'>VBR;DN_#!AG2<_9" +MFCZZ6'+JUKN\1+X&&+2&'Z6F_?SHH>L4_+WR8]]OKW&^4TA$9D;( +MQAHZ0>)]GY1`&RXI;MLG;8Z[#X$;B5"9$"B6*JVX;VNI?5D**[1SQY<:]RXI +MI*584E,M7+OPY%'"7_$**RVWS\?Z\FF@/-U?D'93DBOH^TX!T;L2AT+]5!]ZO@WW.`81SOS7(1,)O>A[H1 +M?'?HB:R1WM+K>R1]%+#D(24RB'9;4GX#'Y:FRQ!9X9LEWO^ZY^ +M8ZZ$K3<`;CS6E&O88113Z4>_WL\ +M0"E+DBH8"3P89KY%RQ(3V))DM\R'H3*J:W\8RTJXW;Q9-;Y/=K*6#M'CO<]5 +M0$$GRDT**PT&0&/<;>E4S'WM[3YL$P'A?S\/>+T0GL.PW;XSN9[$[>RG>>53 +M0_O$"BLB,/;+)#.T9\\J@VU5[[YW++?=0;CO&MW@?<\8?:;!N\=61`1`7?`S +M:%&$:.&BHF@!N24:E7"Z<8N9.-LQ]9RA9PCFY-0<;[!$645N>YS/2GG04Q-1 +M2PG+VO%QI=L/D3355@(UKS%K>D&L8+/!_G9S/?:I:HR&ONO@]]'=80"M`J6F +MWVTO`9S=CX7U4=#YM/1V"9WY]WR]0V<0X=[]T4M^/Q\O@[Y\H6E7#M)E*4@" +M>&XB:MU*,FY!GP+@.?WGM'M&8L@GQ?O%C(43BR\!9%)CZL]W?;TYY1JE$E$I4U" +M44P_..-/3;A,-61:/H0;A4QU:X/88@SME0>P&8&5N\[V=GBQ\5"!Z78-A]DY +M#1!N2O!O-C!<#J639V&#U7*+--C/@X+_?A[P'$9XOH8FZZI+MM/B&6^5R??; +MY<^]!CO@+I4XF?+]5-".F.X-YPAD6QMB5Z.)[;6XR6-*_UE)):J2+)Q_G]J" +M0D/`8#SHXK/TLYG&U^8W?]\I!?_]](=SG&TLV$II4KSQ.%M!D6%,M^3< +MXN:K[+V)DLR<6.'<+Y_]??1K+7@=>1ZDX^"E"/<^'>R%RT^V6Z93HD!$SO[D +MY"2N3M:P@LL6[R6X6,2!NR_QRE85)50&,3?UMC&Z2@DJB8GVE40T]Y7+ +M@R55)C+78QO+-+=/0.1Z+6+#A'++>N5X#DL3-Y4T##;]Q6/2^6&^=ZQY[OF+ +M7P=$G!)1?WI0MB2E&.7(,$(XTGU[7OGVY'ISE,AHG"OP%Z`]G4L`TAJZ3EGV +M*H(F/>=*FM^9OS>'@9!GMFR_5'->D4($5//_SK'@Z'",I(R1.T^IB7?K38_P +MS6;./N@[!4KU\/><6%AS"(1R]$MM%F?)_H3T;`HKVV^(A)"3C,_]?:J>2]%; +M'(;55/`>8L^.6%#6;:R$KF;I4H`L3IZ4VQU$]!,PI8#>E%*+J<`^I`Q2RS[& +M$`]P0EURU1&KJ^3];O]S/=SS?6X]&2CG$W#_\^-\GZ_D+&4=F&7(S&1SO?P-. +ML=Q**5"(T"D$A6I3]O/*@"#=^^8R=!'^]]O#__T-H$EGF=0W8*_KX+GGZK/G +MHE:1C;V1T$LN8BJ(YH3A'#Z7!=+CO!`U,_I;HA:.N:*^+'+_1B&#Y020KZV^ +M4VO)QT^S"%V\`M%@??:2OX;1"=3W9W!Z%V5[U7,=-MQW$TWCU'K7UG)T[O5J +M'QMS'A/>DK/Y$&;/`KX]$6A\`*,.A]0Y"X>1V!*[4KV7-I85:XDRY'2=0Q;A +MKX@3$\OEN^XQY]-I'`16,,7RYY;P6H#06PS*`3.7,>V+]'C)"AT^D[!3]_#6=CA`*`(`6F?>X)K2,KR%\TY7&9>U1(OSF"Z-==/ +M:X+7.,(X:-#[D(C=#XN +M>11Z3ZLVM@N\<_:)=')529`7XK9M(<8]VS-#%O&X*],I(?06,J5+>%,R3Y,O +M4=:V9Q;O^NI%)0ORVRCF.0P%)?=[>YY8(H)QCND'F&+W%P#?=\J8$A);]]HR +M,W6M?G\FM?T:QJI@H>ESFUB-*J>:"BM'5AS9U\$"[9'=G^!X-N+BW4,J"&3+ +MAHRX6,U#KKUS95?IL].'0+L+O,96CHD"V68\;D;2Z^I'P_`80Z`2=YZB$*UM +M3E*K2YM@JCM)4"">=8!3ZN&G5GV@JB4J9;Q,28K'H>S>'I#\&NX_?0<_C[YY +M0Z:VXT[5-VY,F:BCARL_9G5,">5$!#",(SR'8:6V_^3(XU)@?10Z>ZUBXQMOUA9ZR& +M!_'H.U"HX.\U7$+F7$VNY0+<8Z@,%@?OAJ>AVES=@%U*KO*8VWM;J`?7>HJ) +MW>,07)C>:SQIHD-)6"5CUG.3Q'R"V]8VMYJ/[=TATAS;9WW@VO:9Y7>:D5C+ +M60/3>]\2P.&M*?][*00EL:4E?<_/H]^`]M!MC/E[I=2!Y"NH[,QK80\H2JGP +MX9MWKB>+9G`Y#.,Q8O.P1ZGHOI.\&IOU[#)3?')!6FV]-3OT8[H32JD04(VQCISN.^+ +M)3J*22!]5P[S_'U'P!>2RYQUX^"$4G.\4W,]2 +M)66$O]<(E%E_^S#1C1F?+3U::_A[:GBI$7[['GJEJH[]C'G^Z3N`V4!,[=>9 +M^^-,CVW.NVOTNW2N5.NZK#0(ON+3AT!R[+]#?^-M*DIZE]1G<[XG5:*-Z8`I +M;KGF4"27/I@AX%\ZI$9*4/+6YHC8I*]<;3'NW-LW1(2?OKM!^SQ_PZBG\HXK +M\Q#7N&36NOW"DMRQO.$>Y_B?>8PI,9ZR&,37W-B +MVB634J4\[O8VJ.@FRKTVK%52RM=WB8S_5'!660PD*<*4LFA3G7!^LC$BPJ_A +M:?]6[X@F@F&<:FPOB:?W<[(1!5-M^/\;-?2=AM]'YR5VJ@+:(\X\1KUS*A5) +M3UKS*%H"Z:V"LN7]*816I9,R6TVV/3'6X5D$@>H'\*#$@5ZNH"D9+!VME`ME>!B$K-8Y]F,`TP$ZBU? +MD1[W1\CXE5,H:`TLLOP.`7Y_.NB5\;=]D?BF#2++*=QP^I#WTQ/3Z0241AVJ +M[L&X?<%PA5?",^8(O;^3KJLN)5?-J1K&$4:MIVI'?9<5?ED6L.=)_]_'`P!> +M!_#>.F!IQ>C/0N,_H,DPRCP/XW3O_4Z0(J)@0EY#%/ +M3C1A)'-)ABA)@@G9$"5*`@E)MRT[%L!W`NB;M1,1X?'30=_MSA_LDBP3V()\ +M86>EE#L9Q"5+N)!M[VD]E2(1%#H2Z;&R'Y(*#`9"(FH`B"5`$"+ +M]8NE:Q)>143P]QI@T!I^'_W,R)H;BA!`60EM(\2'C9C)L+\_#X#GL!)8E3:8 +M:@/N(PLW1-T28`DC,2K&<`V$EF/<.4*%EW3: +MOG>A%:`K!DY/&'.+%.).C$GNO:(4PJ/OH./$M']05K#6!/_W?+UKL,]UQ#O5 +M@5((H];P]QPN/<9O2&)=XM\??3\E=K8T_X!9:[949?O]Z>'?WRM8E>N*>^\@ +M^Y@RIG:.4RYP/7>HA77LI8&OBP!I_3NY#VC<^[9;*ROF7<@0 +MX`LAGI2I!=Y:CWTK*6QK>Y2N$F>(Y`Y10@3XZ:>8]A&^+Y:[[SI0#X0.%2@U +M>=J)`/Y>`SQ?/M"N+SQJ3M_K,37**'Z`YVOR2O_W\["2-VV_9Y,+Y0![+M>( +M0H3_?A].\(X%$F1SG]J%#FH[KM+?)7EN/L.3EA.ND*$M^MKCR;L!/]+*UP%K:BM='2KA/)1\? +MDZ>=V^\/PO9*(?RJ?KU&'K6&44_LE6-C,<4MGFD"`FS,ES>.&O[OWQ-^?WKH +MN^ZRZV;[GIH35O\]A[NDWJE&8FX[Y",YSHG+*)28,U8;YM@RWKE\E6`**ZT@K4$3K?\1$9">H"@U=$U_ +MEOP4]>!RPE@MZYM*6J=I"9TA^'WT$?DCEDT3\MP;A&$(,A6S?)_ME(+?1[]A +M5_U$ITRJO,DA'PSICY0\'7NE.F3)$0[Y$4$^05^*+),(9V5]GN@P7]>IM8^L +M_9M4549"H$C5SN(";P[AE%.0-ZYL)3:IJQI,F8T-50]D[GKEUJ>//?0E +M]U7?=_#H>P\S*3I*R2YXIO$P(8(YX53/GG0-1'!@OIL![NU_#UV9T:+&?K48*6# +M5LK7YC[#J('^7O#[\ZXZT^HYC?G[SZ.?N09T<0?2=DI8Z_5APKKMBXN!#`%\R5""% +M`$NRM%-JB`U7R:7-E6`(/CW-\QQ[^H2X^%\__?1`]$+1OWYQ0A:K326IC\%97L9-=&$T3/QNWBX +M7SY$9O=R()KY72K7?FQ;L0*P!&%'O2?]M'+H[GVA,VWY$*BH`#E746"1,?T\ +M.N^9*,T>*'X2B.#Y&N`U:K'^\FLQYX.U.\>PSK/$O?\^'O#H5;/]Y.@E\XS^ +M/.YDU98!>W$YBI\YA^N<73I4AE;`!J-G4V83&T!>UQG9?=H^C; +MOQ3XY$HF1=X3,%TRJ+!R9@U13ED0NEWS_ +M.4FF5F7QM!R\+X$^O=^3ED1UG"N<65&WX0*T)-_--QW:DK1TF"MRSTEM\#!J +M#?^,.NQ<91H&[)S\`A0$X1QFZ;0J-_8\A3*$2%Q#:&&`K&ET+^OS[_D"35WP +MUBDL?\Q2C2JQ/^';SY!,Z[L._OL!^%>0;T!BK:((E.9D>F22\A$CJ9E[<^R5 +MM0C!]_%UD`XZ!$S=[!PK("@X)M'N^Z056E\B02B5\QW6.B&C(I\%7QV+-/`B +M*(!44->S#3(<+2Q\6XI0$0*FM5D,'V*>0G"4HBOFJ>>T8V-GM9^BJQJT5[M: +MK*E@:ERSM>:Q?O1=7V(\AL,'@=IGQ-Z$MH$9S"@ +M'BU>Y">?XC)Q\W?FGQ?O(\L316TJ(0*ITH_AAU-=B5MV/[P[W*716R(T8/GGNK>,II +M"[E&",:U[UX4^.A21$MI/WE+4]X(*-TOZ;9;\KC_]/U'9.*/,[6]UE3\7(3W +MZ+5*OG[S^UW/IH"-((<+OHX=_KR$J+$32`=*R_/[8 +MQY'NQMVC5\MIRMM@Y8S-G/E3.1W8CX\';-.]!))>^7+*`]=XS-)QF26$8&K? +MI<;)>;_TG'+?66--G>^ON`\>?3]Y+]/TUC/`7D=P9.Y^Y7"0Q8^XZ!3^-WJR9-_<^W70U/5O;2+7Q:OCF +M.A>G?=2<-FJ7L`/V7%9"KN"(\T#$UWY/?W==`ZVT9X/%J);0]IXMT]>69'WT +MDK76)6/]4QGF#BR`C+V5DP"U_%WA-D0&'8FS^Y1,%TG1E)2^#35+N86(O5X< +M1PU_S\$)VKG]"#'0AA1AJ4?*T]4"9X$HXVJEMH9Q!'P!_#X>2;J"E5R*89;, +MG/"ZY7N/OH-1$XQ:B\U53&*IK[1OC+SP89.49%37]VT)PC;Y1$2`2K'DEU3X +M22CY-K5@`1%?CK822I/3C_<9)+$R7K$LNK[^LV+<0['=R[5>J;CUW)CY<(P[ +M`9%>__W^%O_Z\!T;5E>92-1"CVL+6;7=6ZB96G*N:H*KJI9\IPHK@$[!PL$< +MT*YUU7)W#);[KWVNX@E-Z>=K&-?RBGCA>5U*OO[[D\L!2>&Y:%V77)5D[A[S +MYST]YQ!Q`+*-)34=I),7M$NPHCK'P;PB?7:_ +MTN+@99Y.3NMZKQ/`^_WTQAP#P%IE]4EEXBZ_]GNP4]JSW.M +MM8=%*:4!#[%V=9V+;`%.0,7>>Z6#7;OZC%0_:[R_4Z5B1>L7R]#\Z-[3-.$"F@*!F=)^[W`B!](3W"?1N[TEVVTIWO6[`P65"G5+1G'Y<7 +MT?23N1<)T+HVN16&;#&C"`A$[\1:I1#^_>4GIN)J="P;VG`N+#\3LS?H>_\/#KX]]11U6PD +M\Y)RYB$E%R;%6<*)G5_[0K0[7V@J[NE?*`^277V,D;UJIZ[L.I;6W[MT,AG# +MEHSQCPWC.:X5N?TP:"`@8X'V+JAW`0:,[K=][$>B4MO<]`",C&-X*R9[N4;* +M$(""PC1H-/"A84JL_]G*)3B^90P><+\`KP5R'9G$CN!W"PHKC=80>&0#D:#= +M#J21`_>K)HECZHAM(3:6-M`B3%+X72>B)722+?D95H^&KLU`B`EEBE'`YEP] +M^FY=X==KA$&$7&9F@S8@_![2QVWE:@"`O]<`B''\!ZV% +M,W5*0=]UTRU"I#'=VAIS`:L[Z5Q@7&0_)V=.%QNQD?]<$]-A$2/U-PP*AS6ZK-8S@V+:E29LXST_?P3#J)@HK"BODR'N.+KOB66M! +M_Y7L0TREE=(EJTV'9TM[J.=TQN<5CZT&DPO"8]NREV[:@D$$C"KI5LOKGI*9 +MSSEL'$NUY;@VVRT/07A>B.S7?5*"JH7J!]$"H%.7!.U$4RSN,&H8M0;2TPZX +M6ASFI]2?EB18N]+X;#+F[S7`_WX>284.G(JW\KA_^@[^7D/R&K9T#C\M+KW6 +M>,[*Z^(XJZJMZ0PU6MM#?0SHE`'M5`RDVWY^Q]+O`?SN9^()UI@^MGS@N?57 +M#P+9,EF27A+[HYDGC'<(2RCV4E>M)0THI1#Z[EI)DY,W?81A'-?X]?,%*O+V +M'VCXE.=*:-)L"W>SRG?RV%P.\NK(+G1);/:I11^P,_%-#L^SSN8LEY=P-M>HVX\ +M]QE&#:]AG$)BZ/RY^\3]4^]E%^FGP/,:1E"(5E*S*]Q8J$Y!UTV>]]I[D>M9 +MOL_O_7SCTW-KL>\KMIP9MQX/MFD3IH.XA28(&$T^Q0V?.0/HALIV<3M*&B9^I86(<^DJWCO[SE_YH@552$3P?(WP&D=H^T'&[SZ? +MZZ`V`"W]/HG$T"E9]0$=@_V[M;E!6!)5SR%EXNJKE@TZ5S6Z^RF[UZ5NH5HU +M"BM[UB#(/4$EJ\&$VL+@=VE7(W[K^=^&WJ1Y[FMZ3G*]"W(596JRCW(/#S8I +M4#B`7^+*I:;REJ_A7/#.T5>M@_?[N:)1<&[I3B=PMU6_1D/Q +M("P$3!S0GJXP-@!XUY@?4)O>=/3TXTWLA-;QAOL;N^36```@`$E$053GLYQS +M8RNO%"K#\26RYH..WR;[RL4K3%GUZ_E]&V`L1CGLK^Y1HFWTS5L<.<5S&&$8 +MQNJ@'[2[3V*EH=$ +MQEBHBJXL";"])0ZM3#FX]N2"_?ES]+NE<)..U=KW2*_`(D8`7V@YDB=5U +MM+@FG&#"^3=]>/>A:@P!3!Q@ADEBW"2\F:_\0L],H)`0C"5+I\4F+<:?P7@6 +M4?9F)F(")\9Q.Y17HV0**R9T)K62MQ>^6PQ?,F;*VIFW4.Z$)H"N0Y-TE26& +MK(H'`0AQK7-[^#LMYY.7N*,UP=]KJ$JY;E.B(6'[-N*7N2++-D!/V^24KU=Y +M),,48A/W8F5EB:36_9D(?7\8-73#.)&$L76(GQVTED&SQ.F7\;IS])D.K[/! +M(.Z3M:[Y2MG/J8F%UL3DO>C$\L"4>Z.1@EV.U>CB;TZXY\3*-%[`,/`ET;*V +M#2%C[%,R['+91@8K^0:X^R8[+G0EK9WX]Z0E^<2&^5S9XQ,3CB&192_IJ9!N +M*VPGT.G]]`$!Z7=TJMM+C(A97_;T:@Y)WVG8!C'`F$#0D:ZX1B]DIZ^Y9U[/J[`[W#6T\>"95[8BON[X;AT +M+DC?HC"G(+5,>FZ&OU2X3*YW2@HKS._#@&*]#ZF6<>F#(94@RQVSA!$00]6= +MJH!;>@BFZAO/UW5!NZW,:(L"O]5$R"N%CN3(?B*"O^<`_Y__?K+[67,O$=&< +M%S-YW5M(0B[%FU$;H-[@W;[6]YP$]'@+U6'2WQ-?7S=789P)VDL**SHI%L1< +M95.TY";X0EY*S7N:,+<95KE/I\))J:;!6UITTAS[>T;BVSL[A^'WT(G-4FK'6'-]/W\.HJ6E0=2>L7EM>E;YQKHFOB@)W.:])_,"K +M$&B@O]QC3MOF1JM5F@HKAP^_VP\7)TC)W(R]N4PAQ>'H +MSK-JT+M8T%VW[%+RSSXF2JZN)BF;7M4UDB*]_I/[5BJRJ1XN^U591A`&N,^X_^9 +M?[V94WVFQJ9)WS!E8[1S0#FGG9+S'9L,&UMY1TH)N.9`X;O]G%<@@-7;7OO1 +MFN#?Z[7>'MS/^4#LBIYZZ618[M^EYVH81N@[M5:9N]Z@_1.!]*?,3VT= +M0`!3-:6+K4'?J=-+RAYT>D3>VA7#K7+Z>]15MQRYNNSHMU;O=$&.[AVTALYG' +M:\QH&!`!'CYFC1*D:PBA5)#*370.)5T2`"@()^;2;DX)Z/`]HB.1QJ8-3YB- +M63IU)%I91%.2KOI>[3X73DABK0#9B37V;;Z&$?Y>8[8!$EI[6[)5"BNY52X1 +M5LXXN/D5+9SG_?ZM47:Q9%NN&T!7HE_,.VP>1\0IY&28B9E",@<`0-ENSE!G +MK-];1R%S7VD%T'4`VA/KCF11O7B4,9IQAI`Q+[AS=+CF/$<.Q.2]<3WCSJ18 +MLHE;SJ'7CADTE14>QAE#?N3RGB_?.51%LXS'-B4Z!JLQ,&2J/(-2W[65OAMBI6H1/5/Q:S&ZNJ`AS +M8A=3]I@4D5+H9LD41K`S*"6O(LVRC6-&,AAB'N%+[O,:-3Q?)8A;[N=,0/R) +M\;(UZ]R;OWN-(_1]9]4OY9/J>*#L`!QZ%5T1BB.'K>.EZ^^K*Y2G##F3FNCG +M+<+?P%TJ;$4:2(>21XLPK$)9PX3KP0HK6?)7`.`U`8$$D1*GQ%LN09*O_K,- +MN&M-P40P[P'O5%H\I("^'+6&Y_,%1`HK/OG)G:M6B9%*R+@6P+=4C+M4?@O1 +M="N56MM=8J[6&S[BS,6;D"DGR1S!7XSB$XW"%@`\7=S(J+MN/'.A>AUW3`AO +MR4D\9?UL85CE5)J1`O"NSL->^[*2FUV+ZQW6K3!$+^ +M7L/7"/[SDF3#=R]WFK)9*+(=^">_E)4P'1+X`?M+1*9N=8DMJ2HQ!['@N=4,I&V-FAV\7VDKFGH +MO396[-00S-!GB`C&D6;/NZI"PF5EN)QWW]_K!;^/WND!'[2&1Z>@ZY2U4A0: +MSK?<_N>$(W+&G\.`&GI72`Z:X\O10U%,OA;D'HHP2&%S3G42V!QI-4)O8]CB +M2SA-W$46/,!=FF2)\UG7WXC>\6\Q[84.OP]^N++I75F]+5G/.%L:[@V&<&6Z +MF](@(>:*T"5DK;'OB8)F%/""/OI>C%67^XQ:P]_S=7O.[N)Z.OK->2Z[I3 +M&V%PHX-@C+LYRT]0>94+J!'0?"/EACW7.,BY;`1B`B_?0>=JGM]N7K:;US8]%DZ^WVMW;1( +MA[WDWFIIFI+1^PZ+O_\UC!,`G[^G<*JFIDD#(L[>_^[``8$S*GJ-&G[F:C@V +MGSNBK!Q/]4BW%K\MV8>DO+C2\7BIAB.^]TD6NW<0YPCT&H"Y)+*-36D(;8FNLW#<78"4M]UH$D#`$+?=9M2 +MDC4>K0G^7L--KG0_31H=J84&8C\CQ>B:ZG4W=25'_@Q:KP"'B(`T;=P[FB;/ +M^N]/[P18HR9(O=JCR''%RM>69'2H?S7;:?U"-'=>OD$+]5SAA!:+YAB)O07` +MQ_KLTZY!HR$T:J=/_]\@6A*H*S_UG<#7&++;9H+#N>]+R`_L>:S0\:XY+!!7 +MDY$VTM*^F0F`'+4HUH5"*ZG0,<8**]9.^\^-4"UHR<-N73_S73C/TXYP#'?" +M+&"NNZL>'(F5]JOB5AKH55+F^MJN>W_Z#A"G>'9*$)(`Y%UOKR`EF,)C-.T( +MJ>3!'#?.4CJ/H:[6.OZ"=O(CY_31CM!.#%PGNKDFZ6SI"YF"D@XY5.LX@``# +M+/?'61VGB-J"6\T\0V?2&FK1W!NA5CO?+^53`"P#TW?C9NI>U9)\\ALV5NO/[['AZS_A*_,YVGFVQ[B89YYM?]/VY +M/E6YV6NM!Y0SPM:;OC"UFL.D.`\]Q^`("BMAH,/UC#,1-,H#$XEY35L%C^^> +M,!Q9I08F8&RK]QG??;?O`UD/FA2,0I0XO>/S\ +M'/3LAA0<@>'M1@>$FD)C"+:,Y`=G`TPW`-V/6E^L$*%#?.?BT+$8FXTEVE;% +M!IC0_6CHP-$)(ZA',%H^[`PET\BR&)P'_8U;!Q#2XORC0DKSB">..O]8HCOV +MIL-4"(?51GY-^3UKN<22AS2X].^5%T1D3TZU684J$Q2B9EM@CN.8Z&]/=AT#,_C.-:U44FG`D/\F-A90Z!X*G*S!NX*X4` +M8YTY9CE."BL?'A\!W_TP9%IB66*I_+T=!"?Z7V+WI2I50V8["Y<<17#\%OESSWO^7/7 +MVX"'*U1",O8\"BL`.>N]$X-$0UMDUMZ":?,@UPXED34V60$GS+;"RDLI!7N6 +M6<[\[>,PI3U#G#5-\2I,WG:U7;34Z@X184+#.,+3)%B:X]D7N5'*8^$C`TDE +M1SG[O%F_1W!:'VR$0YRV?*%U6NN@KK#%0L=4DBI1TE%2;G.)GFS?&<9M:H@='W3`,(W0_CZEYI8($/;XYI3DGAC+GUM0E7!Z.$':PY8!P +M0QTYY'CL,YO@W>?>%G/[FR)3K?':8%0N,LYW3%Y,:8(D23W/V3NN?<&I=->S +M#IJCKCI','$`>:H1P#(D!+W(K98VJ]L';CU[=K$OH?%A6*@RQKIDKL@IQL`N;Y0@L[[EACSSZI%[AC-R8/D.$D0,)%1W1C;XN,2/,*] +M3R#M$SQ%DD<]EJ<4J=+V"BOM/8-1UNZMK,\Q%`1/LW6/!<`IXL0RRZGI'O*L +M$)3S/M=.2B6::[4G[8<;M%\%:(?D>$L`.Y^_H\YX8BJ4[<,_-!$,6L./LL2Z +M"XRK4PHKAE&S9<`XCJ!4S_Z.Y%Q[O=;?P+IS<=R.B.OM;"O=*HMCN*<^7G[P +MDE,C/>[E$EOY`-XT%&(]^BT#>$DRHK3W<3WNC"HO=&R+#MY9GK>6!,:YKQ(3 +MN@HKMGF`MC^7T28I)2!SG[_G3;!T&P-EVI'S4+:?E0$LRI/CZ)^VE;EESUID1*ODB.OK?! +M+%X('*=".'D$6*V!B/3VY[_]Y2G[2,@12G>HS`W:Y`B#"2=AKID]==0]52R6/LNV"8Q](;/L16MI"/[AVCH]TY%JZ$QR1 +MU.:@T>Z=M##,$F,FZ4UT:+(]FN]%U#N`BW9T#`2=0E#*P7P9)`L1[77(UV)#1(GY$.W* +MPA+]X7ZG--'9IM1"IQ]/GTG0HAN3\_7R^C/N&7,6> +M'YHRT\,;W,;[G_<>=-L2;ATI*,*K/?/HN%^/P\DW+SL0!SI1"44J`00:T@W0#K#HZ,A;9] +M(<31--4BUT3K)56NA[@UN9K45TL(ZJ$/N+TY'C5!UV&5/?/H._A[#DXM.-T` +M=``SGT.IL^1BVSQX*CUR]29,NA98+TFV]"E[@>5QYX%P>F<.,X&U#^0C8V%\ +MZ_6IA?XEZXRV^+X:!H;/VVZ[-9)0[+8PF5CHV_?U:$]>PW@GHWZ1PNP[M1J& +MBL%F[<&CL,)-G(EZ.K4!]EIK&+2&<=0B2>6MR)A%#\8P6'AOE'>G?9ACRVL\ +MW5RGW27WQE'#H^]`>3SS$LX#]OQS:V7?(JU=.<0(&<+,<[IUVEUW,_0PQAD1MW' +M-4KO00E#Z7[X7[>A5LDM-/59`/ +MQ79N$,J5;);:(TX")E[6/SD!RQK?#OEE'V,`>M-Z`]E"`MO1>D]I?/D.>.+>=L +MI8ZC=(A(IQ3TG9I+BLH1"*6$)2).^WJJED(PC!J&48O'<\>$T>4DYDYM3DG: +M(3V'!`?9$=+%DZ&C#[*@R)Z9^^/;P\,X0M]W@(.E.LSNN^8YY(8JN0HK3UC7 +MSY!SOCGQCBJ6T/<'K0/<>X.Y_O9.$\B4K+^FX*?2ZV:8/]LH7:%G'`GZ2OGI"BL1 +M?,%,HR;X\0!\E_XM87C=3Q8<:;N[#@,I9D_9'5=I+,ZI>UERS_;-S1D[@36W$F5;&451)IAL,9PNI*UY$<9$I!\%ZWSYSY58ASF;NR:_$:1QCO +MN/;Z^[+@TW<=/.9P&.E^)H4D(@3#^//!/9.I.S`/(7E< +M:IQFNPHK%2"Z/9U$4XB34@AZY)[@%$9F[?40:.<(6`[@?_],;(']"26"S@A3:<';<3HK7Z$Q*008QO`[^PHK +M"6F:*!C7_NE*M429Q9B:S))/URGX??31@)U[#B0\[1RCH^LZ&$<-SV'\*">" +MSP,H4\ +M)7S6K)5?[@@BTMD^&!-V??$!044%)FF^;_+G5A +M^DX!:?*RWRW?2R&5>5\-FL:M2::Q_>S3")&Q)0@Y8PQQ)Z#()"K#C'Y?VQ`. +MM>OZ.^=FT1=^H_`=ROA']"BOE?"SG@>9ZCV2^9ZG[#F;%)K[7&.>S +MTBD%KW&$81Q9A&P^I1X?8[W72^3?V>3PI@^CBRHQ&+LVHYZJB4P53G:@G2&;]P1.2QC8 +M]+_^1-;?1P^]4O#W&M@5:*37%R-TSP'H12S1$D_`A]OT58SP0:Q/8M:Z\N4C=QUBA-\5@-BC[R9ER.AG5X$I%1'@ +MI^]!DX91TWVEW="9X,K! +M/2BEX#D,01U=NRB! +M6)E-3XB2UGHU;.0<4<>)5`HK(83'-=$A-.O,/*@-4_7]6"8+FO3X<41`3C7+5D*H>J +MIF15HYQEWRE0ZC&%SFBJ,N^QW^&6!(V56UH3Q*6^I,V/8AB$I*>,AI(LJIS] +MTA*+;M/8XF*`(23?;']3AYR'<\HC2/*26.NX^]^\34]^*4*U>JI!AT*FNZOK8 +M$O]"R:)TS!20*\^\VLZ224(R>;@UO,9M +MS?346L8LN9I0!I$(5G*F3BGH^PX>LX>W0X3__4S@?1AU-DE?P,^01-B2/%>> +MOU,E&=YQ^$9@BKLWZ[['ZNW_/WM7NB4YRBLE<%;-??^7_;K2H/O#&\8"!`8O +MF?8Y,]U=Y855!$**B`%O;O[GB&KE""Y-XRUEUT/EX42G2Q>/+BL)E"P:>]G?8`\.N`$"JH\YT-]T2#F5H(C^!N7RV\QEZZ +M79_%>DE"+1T;E@CZWJP\["C,`6KIR98^YXZ!27?`&#O37_Z\.D`T\)?0(VAA +M0W/?N3L?8`QIJL'FMADG=FC;H3TA*K#D]@TV'/=N_W\+.#M]X:TX%VK9[UC? +MKVF)!9H(TGG3<+SMCG$O20)M$3:32DX]$\0>(01TQ\E46@:6A//#`=H@H!(' +MR5,"ZY%ENIJW_0'M_I@`^.TT=(6>]@&P6S&-XET<"Y8(_KU[,%;!3]?!SVM8 +MTOZ:B8E!O>$KY##R5I07:-IS;MO0CA6&N;T,5J-2BA_O4&?E^#$Z%'DS1'QEC0"BNC:M![U\=@ +MS+AKW2ELAX61SH"AU<2AQTQM5&KW?RUL$5[W_.IB`:ZB(.)KAO05S;+;;+$H%.*.&67`.3S,C?;PQT6GLXCN\O:ZTH]R)&&[EG +M[-',DN0IF3IV6@M4@S&R4DVA$P0R-=50F*?T="9&DB!I3X"MFNK<0DE*-PR, +M22V8M%QW:8Q[S?BVJ\;(Q1388F7/D42_@W>$)7F3AR9<]%I!3^9X3'64I:Z:*G-+'LOKM;4%G;)6`O__@;P +MWFD-O>T/&T-[VBBE',ZNIPW.^Y63D-KW9@C;P_0)(+G.D1/79'\=7:TESV'X +M9@Z6.&FV[K#/NJZN!9`,E9%X#R9OAFM$]L>X\SL3]^-D&+*(TIK74-%)#/:K87P+9(OM)*P7\_7=;S[WY( +MSFS-:WUU!XHE@G]_/;Q>"BLTJ#3]:H.PAO;VL=W[M59@>P,$`/_>;[G]!`!4 +M"BM(&'HG\3R+UC,,S\4G?-5OSYK[EWLY!*6@O;5#9C=PSP'8\<;@/>XY[]PF +MIG);9`S\_%H`_*A!]LD9]KG",KG'D-R]V#BT//7N(Y-2+>7'MG\Z*"\-":GM +MA4=$^!G%E:2+S5]O!HK'"P'U;;L,MOLHX/_N+2A5B4A#R$$?.BVNWQ?M#)4; +MUYY3_-*ZUF@G?PW8A"8\X+WQJ/G,=:`6QJII!SI1Z`HK`N`0R`2KQ(UUOFK4 +MXQZ;G#RPKQ?[=L1"6P_8M?$,E<:V'CT@][8;-^'6%@S:%%1W[;L_]HRZD?)LDM%9D)S[J?3HDT< +MCB$-?[T9F($P'8>=*L->;WW.N&/MLD30LSD[U*5R,EYPJK&8;:]CQV/"5 +MA4+$@;M"!),Y1Z:Q4\*PX]O#6/\6Y:R,),J4E +MI")(.33,H=.+Y82%DGW(S9N0\-!5,,71E+&YN1%=R$O@_AUA`0_H\7Y(C9F$ +M4C+7DU`[+NXJN[T[[E!3Y9:"26ZWVT(Y]8H;,QQC2UD7">Y_OP]FHDFIC;E^ +M[^)M:3FW0V-5(8J3_&@,"2D].=DKM'>7^4<[0?M)HS$Y"5M&&'=:@\G,#SA+ +M6GYJB)(UYJCY7\/NY"3"7FCVP?=)+;8=!UVLPU<&'"`9PY[C46JEK%KRGCU' +MY$<`NKL#^]RREV;<2\S'E:_C1)<(WKV->^PRVNM(_NHCQ^G1'OGIFKC(DYLO +M2_"_OW<6IW=,2.^3;$WM/D)A8'"])%[)+![B6%#58JU97UHKT&:;'Y`:;GNT +M>&L24;#/!PHK?V?;=;48?C?_XDD**VZ$%23>%5==;V^2:4T`7XO:[)E\^Q88 +MJ3>]MN%.W7VN +M:A?///6=V(-^7]U(X5CW4HC0:94M9K5W2!9MG'=4/Q9>^3@;/J,\'P?<9<`Z +M+TYO/VBG+?EH[=EZP<7CKAZNFJ$R.9N83V(+D+1AK:LWMFJ[K<#[!SA76HVK +ME,HF`L"KTVEZY3$\QNY@3WH6X,^PR<8.:KBJ42A"IPV@'W^E0SLEQA8=2!SQ]<, +MI@P&EQKODA@O/WS+'9FE##2MC*36*GIT/:@X!Y)1A6U)-"ST4VQ[5$S)K@^\ +M_82C)3%6S;"SI=`2'>!9/BJV/?2MEZ..&AL'_Q."]AKA,#G)E37#_22ABZ@H +M.0,0%A]0#)CQRL[A\)AP$B'W3BH=])LGR]RO]/X>U0BED2`5\QQ/.;9I3A]RD5:Z-7?PEF6/$2,EN +M%`.PT$92*+'=KK%C0:X:5\>V).#\M!&YD$DRL[;S.47B8G$[Z0B$R:D\R"X7 +M5ZKM_?CV6,PC`/*9GI9O\"P<%28S\+;G+M_/U7J\_PHK0#L`-`N/N:L-._L[ +M_/.5G!@H`RFMFZK3"BLL:7A'0F92RIFM^Y0.<*Z4KE^?/D];4"<&0>W1S5HS +MKQ;K;3K$R:DUP#TBB@HK7ZI&=X3HQ=7`<&W:MK,W02EIYT\TB`HK$8YH=DMV +MH`R4T/$]X'W77,KQ/J=`^_3N=V^@C^0F7%%PJ7T,>,(S3ULO..?5O,+:4?1> +M.,)NT.7M;HS#_2BL5K,,=[1]A]17"'ZKE>6B/F%QYA%;:@.>RN>-U-/>&P-_[_XC[4[+^KB1 +MFQ)*XOWEI,TTOG/?#,JI/5B;9OA:\XB?NW;L62=P9QF^$;Q_8WU+QE6MULE. +M3N6,7\SC7FLAE&X>SEY,SN*`_:H)T-A`M'A_['U:M8^UMI;`9`#W;S2_I?T> +M\]#%YN:KTR+0/K"'F-/ZA$NHTAAP:EQ$25QZS8G +M2(+V/>M4;<*"6D,&&]N13P&Y.;HK)77&D*Y)C=T7'=Y8V]R"1%N%P'Y7DQDF +M!*[W`,\8U=\5N-:_D3KM"BNJL[$RN!Z/4D[XE/=F];/0N\E/Y.3'CU9J?L=P +M3WZ.`O=W]V>]C3/)Q%18<^ZYVJ:V=%REVFJ;O)\W3Y5"^.DZ09L!_'N_P5J[ +M.[1CSS,UD\_K/;==H=DY!EB;Y-+ODN@VK'#'!)K3"?JE^X18$C$B +M#G5E<@@ZN1&B!(!/&Y`<\8^G>.(4\9[9K"'4=>ZH"R#BJI +M3YA,B_%>"BN&?U\=#"D_\>??QH"QE&T[:X+V.]LY7SCP2O6K]WULUK^E8DK2 +M357M]KSC&G#$.+M:N]RFKW"Q'U=P/-%`T0A=#>`=N?:]\\[[02L0@9:U=,'D=[V27S]!/Z+.04:+E) +MJINT>U'$N&\-]S(16Q[O?B-(_I8D +MM)S8N3L:A&E>M5`\7.W0`6;>]N>J/V:Q@)_XI;6HW_[>9I=7*B7X=(:]P<&% +M=9@]V7"X/VM(?G_=$)P^B9+WV-3<8:-UE7'E?KM#I,1.?A*O6>)Y!UI'"BM/ +M:3_VQQ'`"75:K?@^20),3>]1S835LG+(%`)(0("*4K4!R/P>$>L6P@HK`YAK +MNU`\(4UEJ60PYG(XC##S^Q`@U)@T_K?$X*?&["#=$"IK+(9^\+:7Q:?OB66L +MO:%*";FO.Z5O_L&Y\HLJ9(:0-,L!64VLY;;#:'4S'VDMRF +MF-V9%&8):!R*N/SIVEIG"""S3B("$"S4NB$F(8Y*4W*JG(,?$ +M4YS:Z&W?M"/6][3GU=K]9$RA_JB=,=/H(`#^=%@'@O]X<8C_:\ZS' +M;4/VI,L$[M)RRDZ/KSG6)-.)Q14D62OPT#F;>](J93%Q63HF$$6!!E@I7.*V +M[7!EW(G9Y,E(.LY>P^Y[U:H['ENFDE-3=T,V_DR1-#E5>%R[5TDUQK,K.3)N +M[3F_)"@7>K#D"BM\E/#`2-E(ZROG?IH!:ZV62D3E5&[/*7/U.=]I+9H+$K[] +MXQE<*HD58;WVY.C5SMF(?/)`#GG=[S,/8YH@M1T3#]B6J>C6G).?WJ[D9))F).P>M7K"+7474PRCW1JU7F" +M($M$)EKZ[6ICNQ:)P%WMW!EKR=G4NQ-=K;7F5'&EVL#G2,!^][7JZIN5??.R +MQIPF."(9>Q7C#F`CC4'952M14^6^^^25G``F0280()DH%MNKG68G!EX(BZ+" +MID"`",#89Q(=LT#)^ELBMO0VIODI50D0W).0^TU`MVI=+E(&A7A+C_$>@H/G +MJM/N+39[]>8X5IPE=,CWQ#SNT\J$B8X)&?C4`A"J8*Q8>V/@:_*'UAI$N&RP,:%/][4T;TZF<, +MB$6(",@28",ZR('-X/[&[5,\4-V8SQ"SD;TQU=A[[MZWU=:2'66YRQAL +M/7`HKX$4;@XJ) +M5B5>W7O;&"S7V^7L%7.Z(EX\?.I%YMWK9[[7V!`1&**9GJP%<+^S)^*3+HVX +MXNL/V:WW3G7;.RA+8V;`6DL&L1J"?5=(EL,#^O6GZ\!J.X)$`/O7KWE4/ERU +M=-6G%V(7>GCKOQ2XDI^73O`/B_M@!HJ8^BQGO +MQ[`==L:8DM7W,2U&!,Y[SXJU^#Z_0&@QW#+O][P +M1(I?DGQY56_[PX+T1&UW%A,GZ?[/6V'SH]:&M3'6'PM05''OBLS2@EG0A$ +M,GV0$D#:`EPW#YF$^EP6,5IW]W>?DO0NL3'H8Q+$07:)9"TZ.T''/`$2;A9S +MU9BOOUF*+8@IVLB2D4YIVQ1]+V7,,LHH$T96UVTK4!"X]Q"`3 +M*/;AU9)"VS>NA\FH`DN4.2`B'AH**[/QX([ZAN^M)1Y23+(<[.-U,@SCN1"J +MPDWOXA(E4PHK<7,YD`+?Q<"$"BN#;*+1%!$OCA2LUVB\AWODJKL4^QV3],.U +M4-48ND)RR4MINT>=)EER+(D7V])H-K.KWEAPA/F9S +MD_0H[7XBE7AO;7?5>O/BZN8LR=#KE'L,]'67.U%JJ9E60)D0HK)<72K"/(#W +M(JO^Q*.P&NIQX@6I*#%Y*2>B-H&4E52`40H/W*L%AE/P#3'M(>]9*$2 +M_1H;W9IV8@HK\;J3#3U:*`HKG[RX,N">.P%2/*%7`YX<:\?,GST>&V&C27`W +M<%,;/+8R%H^P1JKMGS9HM<'.>;\6B&Q9&OHKYG&OI0UQC7FRUNBH;9=JY@"= +MKEIZ(%B;T#9&[K769B2]8S22S8/G,R2!D:*'%/-`XQ8&!J&9Y8?#B7X)D2 +M89+$JDO>$R^3%*@(OD=INLX)<-YUTY02`=EU@DBT44KEG!VYN30+VUD2UL16H,IL2] +M4C'EX?8/TR:GG$KSMYPX>H0\!Q;GO,K9+$CF;HW^RA7OD\ZK9/L4QN>?CO=( +MUM=="6B7&JK6Q[W,E$Q2698:RZN"]#O$B1[NJ6K$;%/RSA5HI_CQ3O3]`=#. +M/6.3;#:"34+EMK@BN&\U=X@(M%*@O3`9SH::2FPR1]N/4OM_56OEEE4IA$YK +MZ`.TAW7:D$0M$@-^6?6K,*:-M57:^4JVH+P\]3A]\)+UJPO>CZ]7)7&;BUY= +M35:86ATD3=1BU4#I7L"VQH`__4@WX;V0;`HKGU"7JLCQ:8.3%YI.JZ2'>&#H +M^(S-2M;:0,>N+;EY7+^O#I128*UM2GTH77NO8!^-C2LQ;\N('VD3)J\XWAOW +M?8,5_VS@7@HKVJ^JTK?Q:LD?O"U@J.&1:;$+3BTX9R7$?#QN?YJ@RGPK!4Q* +MJ4V8#/<]V^`(^0HK`#YNC[$9=WJ-XLPF3LL*G<"$7=I*\[;GANO]X#CG65[C.*I-NCWI44V +MM4;HP95LAF@=H:/KF@<:.JUWLZ15:S-'Q3S..][^FG0&)#;\3FPJQ7WVV-CG +M.A.XHY+P7:J-(,9V-%M0?G9ZA%XJ@3Q8"XPEGH92(8H=1EORKAJ+PE5`.R5H +MQ(*).V/B,(U_7PTO)YG3"BLV!>[?.6&BU.8@)*04&Z-<'/CJ[T!`:(<_R>?Z +M5J/`$2823=?TCC'1I:G9K)V:SWUW?OVW-Z$CFHG54$.IIZZEAT]R4L3=^](: +MM%*B1%%C[":<['"G"*8E?A&V[%R<)A>FOI<5(I,CS$-5$F`1!XIA6I)`V*35 +MPVRW($$<8#@E**%&ELX;8^U:U!#3-@L=<\?];NIABH2V[J55SDW4G/I:C!-":E+DBHQY4B=1$OJ&EM_4V,C9)-JV%LV=T/T +MVJG]]HNRX.%<[S)'#2F:A>%@$AF=^V#`#9UPBF/P +M*U(H[3ZVA[B`>E7WVP$NOZ6_0\841=BD=-RTBYQ^/$U\JZP3&Z5CQ-Z8#@TO +MZD388ZL&GG(+&G3P?C]OU86.\X6DPBK>HY8`X +M-T_N2'RQ[Z3]7N*9):MX;%9UJE@VFL'VU3P3>(IP1JMOU?2X'QVV5--SPQF( +M\R=#FW8@SB5Y6']\&7!N+,"$$N,'*+.3$QC*H&4\(XQ.XBDO_<99^5&2=[Y[ +M.X3+>)T9LKLUZU+*PH/0;GSX7G%$7)PJ'QKO71+N>>7R'P>FCRWKF6M"V1RO +M=W(A\KBCR#0L.Z`6[`!WBJL_(EGT:A[W7.&D4XQA/08O&7B_P4;JN>K-,RZ> +M.@C<+5UR+O,@%9)L76)P>G)])"%SQM@YN?A,&F24UJUEHXYJJ5P8Q_F.F&NL +M:Y]0_J/[E/7PB[]'B156ZHVGVXZO3FI`D(ZOU%TG2ZV8L#M)`.>(L1PI/W]D +M>W'QYZD=A'_KWO+::O5]P'\68G=<'!+;96\$"%+[W1Q;?<#>>?=E[`#<)0)= +MY]MCJKY66J(E9MX+[YX\[M_"KG)';WNIJO@]ZBH0&D2IE?D`.LBH01;'/15Z +M80[F%FXQ.(_@M]_SKEI4D]+[0\DU(;6W4(R=%2;7A(S51KF-H"A)XCR&/>:=F%72,QJX\'W&;K_3\1\;T"@M<%-?3S%:D*LWM@HK'0HK]@UBU8T0$4%O+&A$4`HKQU`9$LU+#@EPR;WD*+92Y#U[ +M/;^AYU/CL23T,_:\E$;3;2^*G')P[1I;9V/?RID7,X?]*HQ.N`Z@;.ZDRD'( +M.4S*S`=>B`(\J*X;J$>G*`;8EVGXR0R-5S^JOE-]:N_:/ST%I;H_HEK;AUO^ +MC!.3HY.ERKZ'HB!W@FOG(;`@C/:#TFFC2G2,,Z/<60'P[]U?TN[ZW]"HJK\? +M`:"W!+]:K4*ZKKKY/!-@G;$FWJ&]GJOMU4F,'H(L'I-N,K&O2L_(>2=J??.( +MB4Z79\FXV#8`V_5!A3?Q/SE9E??2"[2T2XF"S#]7G3LEIQQ\G18G4.U3RCT; +MKZ.46:OWB\+J^5D$(P4D*=8.U)R3=XN1+P7A*0_J)[;5>7E6Z([>=RG0M<,`ZD];KBP +M&VFH1&V;?412WW1IU:(=IS#%X^S]U>.K2Y,WMR&@^^?^=P-X`37Y51-IJ%ZA +MNBG,EIQ!A>BNTE/6.F[;Q"4BS8RU0\#YFVV,&]-[2^6\&&.4OGC]'JI??K'Z +M((8!(`'C*"%N5)/3O^/F+`%&)M&@Y3V16#7'2KD+*[>0YAC%U#N"SQ+.GD[: +M-!(Q`'BM`+B.51>&1*R4#Y'M)S=JWHUE7^XA!^SQ=9S^:9V8^Z$/>,`=!O[$ +M&YH0JTC&NUO,C2-!TMIN@#<'4,Q`@HM.G?\&87F6'`3>%H<7,F1N](D'D'E? +M,0VM+\B`[DJR?TL;+8OM8$(?"SAMYP^_D*V&291N?I]KJSAF+G_=DH\;5^@H]!@Z +M-E1*!SDQH5!J3&SZFCQ)#(RO<0$%79QC(;;Y72N5XAGC40`G\4X?U\93P''K +MTH.R<\N%&!3W"XF=7<197W^4D.QM$F*:`P[JYS$WFZEI["VU=->>;FU,.2#J +M)4'L=!TFWU5MH<6H2PP=)HBL0>.^YV#0SE4-0[]&R:*((70?W7"M/Q!)UAO; +M*IQXP1N<7&K)K-TZ<75UU2,)B'00>8A!^ZRX1QL#O4Z4!2#<+E0^K:0H>8A; +MG`HK@36YZJ@Q`5F@['=_SH71A5=@2"#?"BOY`-CK(,R9\@1(6Z#%3H]"6S>- +MCSRWCNR#275:SO:'GO$2P?>8]Q0?>XC!,;C1BWX'X6T,_*JN^NBV1*!!!4N# +M@CUCV&:C0S/J)JL2@Y_"]'_Q9'%<`V>"*+`'H/PU9G18QE6V^29T`5H,O'.@ +MG=MP).<]Q6]:E\?_3D3!U9MCOGKXL$_!7*@1=+[%K"_F@$L2)K<>N+3-&Y'5 +MV".G>#Q+ +MS!WJ6OI.W/'=L]L78\#_A+96.)P@IA)(Q4#=$KR-63D8.,:O*XS+;3[88Z^N +M9D?VY.SM'FOTV>.A.]IHWGEQ.YHU0"3V4;&L.7RO)<_=!6Z+VBK0?NY_R?6D +M\G#:&SN]*O=SM;L.:F*96-#6&]9"9&A]__7&F*@^%UN[%"(88P.'R_DV^J_O +MP7AA-]92D-KW*OTUE.\Q*U><4[E)['=5JSU\[M\9;$^50#ZN:1]^NV:*RD:A/4O^6V(A0:%]L;N4S1J&X7GOJ%$N, +ME99_SXDX]XV0:&+..V/B4:5VH%0<\LJX4S+FB`@ZW]B6ADL\5_V.OJOWZ9/& +M1A8+R\D&A.#>9PHK1PLNU1[O"&&PQL7CUHR9+I^?Z8U"34K'HZH;`LY[QUCN +M)JK5.$9$,-8V^89"!!-Q(.P)@6CYS%W6DY)-]IEM<<^^D#A`[CN^NJ,[Z0X" +M(U?Y/EYR.N#,%',T/5\=:%L?U!?7N78'?\!"]XD+]A8(CP!)*;#6KEG2#CSM +M7%'&?=`F/+71X#8F*'MQ,8!OZ5#0`A&FO"1K>1OG>M8?\/Z=CI0]":ME"ZN( +M5N9T_%@ZOCMN-_U)'M,[,\]O6I\:"?T* +M*Q&Z3L'[39FU7PE/Q-,EE48J"$VPL@LD6T:.7U%2I[%2QZ-0&/4FJ; +M6.*K$[#,A[@UVM[B(DI@S=P@,*3(3N+ +ML2T;`<4FG$Z);@06ECQD"BO69_OS+6`D85_'$DS7XAE>6AJIHO&DA+.AUJ+) +M)0?F)(85SVV2M3DB@AYCE#=:D[C-5/"]F\.H2@N:!#G3/5$N`DD2&"57S=)C +M]=(8T[)'```@`$E$050U(L9V@I$=M*KE,9",E0]1)=]+F=Z1T/=S0GSBR?WA!._MVK6YA/DG$2A;47O+`DWJ1G/O-]94?KL8_/V +M7]M3V;)K$7&*<*(C-CTYV&-#[RP=.`EG'Z89-&HWW)$(X"M1";.9[(X.>3F< +M:E*0>$2C['*MV,4KBE65Q-0_EZRMKMYN9V\N:BX+I:=)-3?U(4];*@>E[#1P +M^SQ&=@FM3D9K*\A^$UM6S1-0_UU:JRIUDX398:,VK17/?E]AP//&\]-&]^RO +MKG12W*:RHKJM[SQ+_.C9^=X7O%^U/%.HUJ@HK=F,![D,D52S1U#9IB\<^G6O?GO:_5W^=$BI3 +MBSI'XLFXRS']%4`[9T`E,8!'"2%(O=Q!82C)MT.Q<512-XH#@I@X4T';U#2] +M-8^>CYZ#G*VJ-;]8;SN4"?T@XK:AF>3`6B$HY>).9=]EDUHO:!_/2$JL\3TU +MBG[MW740T!PJHQQ^>&X<&-N^?:X`(FML8+/R#H3OX6+7CZBO-!&[^3RB=$@1 +M?M@>A-M<=6>PPT@`>*GQWGLWK>])SBW8OYM>[4HPS)>_+R6U) +MV2TNQ2#U3J44&`<-34EV1U(VRI[-M]F2#9,[I[+SC!)AD-P[%.(F+`0/L-\M +MPKFT5D%V',DF&@\]*@**_#@IYP[N>N3-'$T%XSF)8S*P&QN._")I7'' +MD)_P&FLK/Q%U3\)H2G@KU)Y[V6:2X^?##PHATM8Q[OFG&-=N]BN._^H)Z06=H!%7A)!NV)[4%H48)D*< +MYE>WV6)'3N9WYD1.\L$H;QBNJ@$RC9-.H0BT1AD\`,#8Y3Z;8FXI:(=2E=5O +M"BNAR5F:2I5H:\Q_R;AZ<@W:7]U50C1*.KI6M^@RZ+WJX>K50NC@?RP'%ZK@;+M3\CS5 +M?;]Z1FLU`]VFYK241=SK"_H3:$D_Y\/ST4$+I/KQJ9Y\$-N^'C/J].CURE7OWXSGY6GNO3L`F(U':-L8N8Y8) +M!5R!?,H=U_O"M+YEC9*1PI:/MRU6>?##W:\.P4:&4X-=$NL!IPUDD`T,*YP6 +MZ_?'HFGB<;1J4^[E'ISAT]"FSG>].J_%(J;[T-U\MX"8J[\AP)#8M&J'O/AV +M+GY]_OO$$\NX$8[:@5L75!,!S282`S#+CO_'N;@T_[DL:@0$-`GES+EA$^." +M6O5K3%2)@+(V`6%=AG*O%$749+'@O7SR9O[BY<]LPG$>4:G9.8):=?1>J@"H +M0KNQ2:@F)@^[M`,Y]H([#?3:.A0;NK5SQ/MM][8.CO.=[8MX5(FAFC.7R!.U` +MY'0D[I6GR+H+FWRBDKX+E0TCHH&I]TO'.I]L.8DRC>O(*`)89UPN[ZB6)V_?P3K?.2EC++E'\EX<%+O0AU7,4ZOWX0&# +MS#EF"WRUQ%MXE2.P%!L.)3:DR_WC^)NDRLDG_:#9T)*WX5IN=#=C>2JFT@TH +M,=.F?E?D;=Z_/?R*Q'U`#@@#4`HK@.SHL/!(95!HEWCON@0<'KY251NH4AK- +ME];P[LWFYQH1_C+H#0_7(`E<(>[VR1Y+P[7,J)8J:4_$N,!;B_7@RO:D_=I' +M37'8MUV?=D+0?5*%6M0EQJS`/T"7'63?DNQ32D]9(AL^L\X443C6-_-W:.]/ +MM3$EL9\#>%=@QA15S+`!.;2/M6U+<:P\LUMH*:#UZC00T8KB$!&'T!FZOEWD +M-F0OK8,>S)QVZHW)^+X\?.N9:+I3/MK]/?MY%665"%%>!.P\SF*(! +M@ULO6K_2"#.U +M#"-0)%W,'B?,^CF%")U6\.^O]^X!Z)2"_[W[W64X>JPI1":A.1_0&&O%2;E* +MH2A,Y-O88(XD?'B@:GWGPP/<+[1WEO(+YSS7WI/?_IL2&J=/`.VK/[$M`*=5 +MGD(=8TSEP>J7:?]O,ZQN?7,)2G",5Y[?067`L2:?\J<`GE>GH3=V0W'XTGH3 +M)G*72ZLZ)SY]AI)23)3I.F,.;VZ +MY*1-"BM?,"4_RAB'DCA)<(\4S+M*IB6"&WOJQL;@!X2DHG4)_CPMW)1J[Y+% +M^,PQO9>;N,8F8R/"9"U8:P,G9WQN!8[)8M:2D\^.Q0EP-3SPM4[^)*>-RDNT +M1$2@1-)D4MAJ]$S_[\^L[M=*@5(**_Z]^V*'3XE05XUY@AB.;\\9'];2?#(D +MW3Q18M[M%4OBGELVLY+$QWCH4$D(VQYA*;?\*>&BW$3>U-ADVU`P7O8DH990 +M?E9S6IWHJ*IA'TL$L[IK9MJ6[:!;QH8/?['">]LEFY:^)R?,QS=ZGW+TN6%E +MB0#GE`+K\DP>$&Y7N<<+<18XW0`C(M!9;"Q#Z,:?-8`83DAMK91ZU;X)_2YV +MCT(@4PHKWL9FLV#D;!Y:T'`B#CSTJL*[>H\6,[$DG&Y;0FJA +MC_WZ3K&JLVU1J3Y&S?[I[MIX9WSS,@HKC0WJZ,9VS8Q6_`.&ZHL +M*8UC-H#_DO6G==I8;:_YWF>,)=`J[SV=UO`V=I7;'O*^T8BD@2YP7.8)3@V(J7:;?'W`:!^]G +M@-B6<_OL_L9#&/\**X![4P_N18%Z[KO=A3!)&H,\$?O1G2T]WMH>*<8GZ-UW +M]K&PE)CG?1T[/\)W+\;=W?R(F#(J@^/++BX?Y@SP033!FC/46@L$.JO>2H]Q +M[LPB7`;:[^U<$=,M=!I!;\_'6@G?."O-]6XH'.3D',OK12\.AV-:\\M +M]T2+*;7C*(QO/Q*W1S;73J& +M9*%*^Q="1(2?3H_JJ'OSJIQP/AM+2N5M3:S*+4$T&QXSYCRY&]RMK.`-0'A1 +MNX7EE^C$/WX@U1M@0OLF`>\S[O1(@$<>FAZ?#%'=/F8/Z +M"BN+9>S]ZT%(&P/!)Z_Z7J?ZM)62!-7UOT/`7$U8.V#F<*[99(2L>^>X2*P, +M%(VY`&Z+1`Q8T,M/4^*JMT4BBOQ;;E22HE1,W.C\,Z3`!B@\OI`S:&F\']PH +MK1*N*#R.I_F3@F3IPV^0X)YKQG#8TR$264/E>RV;/L\U%HA=!HG0Y-3H/!F +M@G",[>=;BW/:#/V\;].\-]%SRE'8[$*8Q%5OI?!"S:)-Q([OTK)S]XC4QF-J +MHD2@1BR&Z+K3^'`Z7DD9@^O`GGRV4$C?IP#ZG.3@/=@O)TFUNW-VKVB!V6E$ +M/S&N_;GR)^@VSAV;&X,\?\SG7363_-K.1USA\"&\@*#3^8`MAQ$FQP-_-QLD +M+;NT7FZ(R%6U!B:;T$T)$C5U/("B&Y=0N]-![;#7'GZ:_=NT!V+52AX1&U_# +M&W^%,*`KVL[.IUUD"WYXFU%R*F(DC*`5E5EMS]5S'3T#^2'#R7XGX]T+F8_6 +M[Z0BP:>:B\)=QNC>TZNFBQ1NOSWQA.>66VL%9&RRWA)FE2OT<K\^.!%"['Z.VHO!%S(0"XM +M),`B&B2I]Y4353\!2!]=/R("I;#Z-IXH3W!IF1_'`O8]<_(3/>XK/$,5:\DX +M&J1QVSD\[37Z]0HKB;)0';JW*WAX +M2M4]0[%GDKBX-8#%['+&8JM=<2))4F7HV9PVRWFF1.@I*":5F30:`_G1>,C( +MNR1M06X2F`<`DI.-J.GX3RURI?-H;WFV\PS!&!ICE9U.W-C-M<*O4FJ(=4\P +M><@<#?OH(&,GE^Q[4`XZCXB%/5KQ>LJK(L%:%:KS+LK'0-EL0"4VEO>$4"9B +M)`&"*>$FWU:6Q`!+V']R;4/*9I3663(_^)FUQ!V$XME+\$,.8$^M0[GCOQ8` +M+K7O5TGP3]G'CF>,(69X;($Z5MKQ(K=_1F:(8L8^&X]MZ.?*GWCUV$_"'I@< +M@]-B`W!$NS4Q@H(]6DB(XFBOR%7G;F\M_*0V%4S[O3H-YL_>;J[C3?NP]:*. +MF6)\=X>"2Q8VM2L +MB8]7T[U68W$L-EDTB[3A)<_MY*O&3^:\JX:D^]7`?OP99#SX=9-;0HJIYPM% +MI,O\Z7&"5P-_1#0FJ>;%H6NM9K&@,^IU=%)K[4346F/FC/'D'$.'"=?LDJ/7%+$`6^43U:NU\>DQ[D'`+_O1Z0O/ +M$5Z8TKZY(U#C8LZA<++6&L_39L!/3O7!^Q$;E$AGBPW8)X+W0]4L,2QBX?^N +M-V9A"JTL/20J^X%8!V.B'FMN6[ +MD)YK^P$./KJ+,K,"2](Y`/I,J)ZOI$Q"U"%#!-)[Y4`(T8/0]9\]8]M +M7$]#4@HK"Q$,4#!Q)28**^$#4U[DB!RG!ZV$CT+&:$BX&9XE7",\.\;N4:+N +M*^,V)36-]2>'6YMHW07#WQ%,(*F4>S]-LKGD(-)4TBUL$TS=?RO`.?Z4&RH$ +M6\,=3'*JC-P5X$:-%7T!(5S:T+425&&^U=[LL0F7BI(E8N>,#_P`9Z<%,KE` +MMK?0_73)6OM,$J]7!W_O/F#O8AM'VL4**\*&#F;:+@2>!SPF(3ZL!8/'5Z$" +M$U$ZS5T'8N4>^IAC\LGU'(YCA=)C,A2>J4!E.\`F.]6_#>#H==FXKT`>`J+-BM/WVSQ%?DO?[,O=HHZKJOA=9YU:-#4M(0"PE3"0) +M^QF6+,7`"BM:K;0F,O9#ZSK`D!2?2AJ.E7UO_SU77KMU1Q=.%6;-EW(SH_!G +MTL7H*CN];^,UK2Y8%`#K%M:,"BL12%?#O59O/,S_KQ3+#R$F@T^QDFT]-^[\ +M[*V%SMJ5[9.\M],**XP9Q)QNY0W2"BM^NF[5QI-"\&I8M!JB_)5_F*D#.U?P0J35=6`W7O?SP__BB_@PE[3K(102 +M`!`1_/5&Q&5_AB!>2[HXK531^ZT=5%'=N6Z)!O">NY=->$^O');VV>`]7X"N +ME;A2JV\^<>\93ITS@=A9QO0N\>S/#K.>226D=F\)^CQA07ZE6U=ZD($+P +MQG`CMX/M=S&*),`!8Y+?Y'4W%EX=99\X:JV@L\H3T*EWLM+"V6&)X-_; +M@%(6M%+0*10Y66A\+I08>8:3Y+!U`R"9Q!RZ>F-8`#6!^1H6R0^W*.%X?Z[\ +ML9;+G(-.B.D1."&F^_)<[:[NC`%98@!+8A=K&VHAM\D.TUT^8:ZP$#5=4-,>N9EK(V&4M5N#S<'XPA0>#35 +MX%'?*_N6B,5C=9OT.ZV\\[DL>%>?RY)Y?DPRJH0HQCG6^?Z5A_2JJ=VTA8 +MA]`XEQI*2@#G7)"O%$)O2%2FE#*;#]ISDAUKR88+GTLE,G(;>FZ3 +M8RVM5%#[WD"G]-1&=I'A960!^!*`]-#;[7JZ*&K,X>\]P +M4LF7DKJ$ZA&;E_X)P-YU+E4F*;C,"?'BUK6<3?K:S@OJ)DA6#H58INHOY4^7 +MB@@>H;!<$XL>448B:N]Q;RUNE/JN$K9CC<33%&#^)._$69NV5,B'*\3D_CNV +MR2"/=QEKX;^?%UBR,#'6 +MO?L>?G]>\C),'A8]>-W],)+6?.HMWF\M#0QD%@#`?$RNC@N,))="A)]7'+3' +M0*O-8=T965<>+^9SN;NT&.!,;9J^IKDN6/?NTQJ!6W3PP'J=H9)ZQ?BRLH3( +MO8`=6+#.E86E?G3\$!OPSL@)$Z7K'$^&A:I2B6IDZ?BTI7E/#LO9<='&6NBT +MAO?H+>^-!6T&SWN.(V$(I]!@_^PJAO6H=JQU_U4WJD>712L%/Z\NR._OOY>S +M?;8@+"ZT1CQP_@X7`7\V4GZR(*'U_.K-WD7W*Z=XW(]_,(:N72[+EZ +M,WK=U>(M?_,-0/6N3:(@/TF;VLZ,+^,4 +M8V(=)X$H1`(B7/4T:[3&D`::3[U#DEMAVC1TE)](,EPV";)^'\KC`15B4@@M +M*O3A"?F$ZXS5C'KNR9)XGF*B'6C;M4BA#;%39\BC*#36PL]+P__^[#RFW[V! +MWY4H$T9F]I(H_--I(%HG).X![5Q^#S(;Q-P8]]#O)7D+I=_*>28D"BLD,>T8 +M;*MTG*Y"A)^?;HCM%^W+*;*AVOX\/$<&P[8>\XDU,?`JPFE.\'DXDZWURY33 +M[R'F.0G'_.:YE2:'*Q88ZK.RD+S2.&UI#L>:$6NIT6I\,6O.)(0FC9N7QI_G +MSK?4?1)AKJMO'O:<4N;43>1Q/_+X?9="Z2[H6JINVC+Y-@3>CP/N-7>)VP5@ +MUD[=J&[&/D'L1B"F>+BPV,0467WC3NX&@YQC2N)G!!L**R/Z4GR&Y32WUCYU +M8&UO3]WQ5=L;BCBA;TK;&:9ZZSSS9=OFPFK_.848C37NS>!A[[0:0V80>F.@ +M,VJ.;\8,K\_OJX/__?7!;V)F=B0>V'?5"`4R/(6U[%?2&43QWP_A,3JCCL)D +M0TF[4.X:B9$$QMR?'P>:5D#7:4B^S^GT,N;]/BTGB42L1^)LN"NI]W/)+W&H +M##;NU.2B6OHND=2R;&MRINK>IQY32?G9_032[;,H")7!:(P[AY)=K\SJ7MR_ +ML2&":B$(\X16"BO^OC`NL=7<3"6LXIA@^._=1QB'`-[&P$LKZ''95/V]>_A5 +MKT$Y5`CD)GOU\]+C-Y\^S'T7[VFGJF7U?]]I#:].UTIGF4\,.(_=%81LW$W' +MD>OF$P;T?7:^95]?54'\FLFIF/9>U`#PZYTWWF+`?I)!R@7M4]@.1=X18XQ) +M`?P-Q23CS8^IV&W#;B0^]_KC9/'L?I\Q'XZ%R\+52CQ"B,,IAS9J)83C7\98 +MZ/0Z>=@2P?L]AYOBMFKMD"GMOSUVKBGS$,IB7OWZ=%K! +MZ]45M?5VC`(8,U!G^N$V,:_F&6#^Z#7+S_5ZP/OCM/G4J[MBP^-.HHU:M&YG +M#XAO\Q[DU%.2I)IB=@G%>!.4Q_CE/M.B;[\-N+>>K['W3DJHKTX%%3^GZ]T; +M4&I]GS$&^A[AU779-N&E-5@+T0W#LZ`3$-G@[Q:0)T3N&;89$>'5#9[V6O;Q +MW1LPQL+OSVL>1Q)R@C/7D",5/!_`_GUV_AO[NSNR@5/@)4?$8?AW:*$DUD`? +ML?A7Y=+.2`#EV`:XMHVQ"BOLI7#DWA?R8I.36$JYM&:>!]Y?5,,@7L!2XL7\ +MAI@;N!`:;A1&Z2")P%K+LM"(^H-+OB("%?&Z[Q&SD7KT1"P7#>99F+HS`'ZM +ME]CEJ9KZ8XRC?.U&=ABM-;PZFMNC8&H`[YS"XQ#O_M_/*S\D$`!^7QK^>K-BFKF2_2MI +MY]8B4*V<4SB"ZE?70:?5[G=/&\=5_T[VJ5!9^+GJK;]G?C>D;GH7X_Z,W?*K +MD])@(=?Y#3I'0@F4\^Y2YH.S%%!C;?$-`YT51O)_)GR.WVQB&D-_VQ?5JXO,L@YGMV-Y+RQT!D#6NOH2<=L5P+?LT3P[]W#?S]=MEU# +M1/A](?SOW>_8J%T'M-=8/[:C.>4%557J*07M.?5Z]\,&W`7R[SY.^OIMX02? +M*#HGB=8+/]0^2>="3KCI%5A2KH2O[GAU;"?B]I]XX""-[PHKPS'KG)A([L2/D8-) +M!CS5VLUZ(=E[C^H0YB@0R`ERHK$@,[=YHEMJU%X>M^GS*`>DO"/EHE2%("), +MD?J[D%6F%:=1SF9'A'<2\V/?TDJ9KZ'"K\F6K1R!GBEI\.,M_.KT"X`0$ +M/Z\.C,%D`FMO+"`:^(G$1G,+W53>WU<'?V\#EOE.JMY76CSEJKDDLMSQ9_:7 +M4\]JJ*I:Z.'0C]MWV0,W^_=)]CQ6M*DT?TOCW>/W453EY&Z;F6_PNJ?J +MV2$7$@+'2$1GHP8/T:)`5()05H9)LX536\L9\H,`C*1Z`@HKQ`@[#I=D$V4X +MH`6\`_(^J'6[$)#%E2#2HH;G)9U.L!XAF2R:;XYI5.KSZ\@(3\R)$M.1,H*E +M=MG`4"!"69%<+Q(!!!0YL&V106RPGQ7N\ZBL:!'<9HA$YKZ+J!&M)8.S.6 +M&&/@]_6"_[W?&S#F?^/=FSGL)E@>?X$?_]2(\-_/P"N?^LX\5D'&3%("7&J] +MBT]6=723(Z]`2LOY[=G4=%JQ)RVE(&\"[:E-7JI?2S;M,:7;O$1$?YU0V[E' +MF%8W9M2PV;*0+`\LEA":7$,KLKREPF!3":3!MN(#26%#`LLI?5?&>+DV-6>3 +M4NK\D\Z;W+:))2M+R\DF&P?&:=-0F:.!/PO(+^Q5BGG1SBSG`#SS_)BIB9-# +MR9AZ/OH#.+0L7YMWR +MN>X**\:UM(-1.*'QP+J0Y+&(D,?9W.W+=_<'<*3XU(FYCP7.R+UO[2E'R(M_ +MEX+WG+[@ZEO+.U#6`3P%5PBLKA_EW-8C2$47KEYPT:(ZP/_]*/A]=?#OKT]NV/YZ`XB#ZN;F^X)-V.^K@[_>;#8`>S9N +M-6QF*U*!,)PK\```(`!)1$%4VC9^^GVG!V_Q$,:T;%I_.@TZ=BH270)X;]]? +M;^;X]3VVXNK<[@T6K@>\AVPY[6>;RJ5]3)UP2,I_UO@L(079DOO4I"0]GE'T%/&G?Q)$F>W+&Q:==Y'\7>F_X.POC8U@IU:>,S&V#DB-J +MLFWZDH"*QE.LC\AY]U46?NZT2FH':H4W3%=O+)@1*/^\]"8\X&T,*%2#ES9A +MOP;POKROQ#O^\^K@)Q+&(7WO\:>!)/QOWWA)U?VE]2":Y6Q^M!HV15JKJO/U +MKS?%K$!764-.P^T/9F^*04IL3PT[?IK=2RRN#G..X +M(=[@0O:XN#-.H*+E+C@;>`9`-`OF`A[Q/3O^=2Q[NOU6RSV1>'P2$RM,B7NX +M^/80R)>$"-DQ-,D=`NP&@!&+@H!X&4%^>-(>4!\?QVDU6@3<3??W?[V!_U,**Q2J%3WDY+55RL)+*Z#1(QZSA40$__H>?F"A&,0,^X@PT!.B +MLO#N>Y"GI%XMLL$9.9P)T3X]UXH5?UX=O'"#I@$ +M[9+PF-P3/(FH(66*=Q&4>$_+[$FH#ANO*&"T3GE)GM(ZM4UZ/4)?98^X4LC+ +M+*'2E@HK*Y6V=7'$Q,'.J)@MY-:"V0[5]Y#D-YYOJ*OOM`0@N66'29A[0HM. +MRV&4RD2GC&B9'-&DK#`5*&=&:;FQ@4I`>*EC9FC2-(:9L`E$!+)VM\8&%8RG +M\$"FZ.:]Z82O!,YSQLA?W\//Z\4**V$-R:<#=>0$]./O&V+>"32\M"Z8YP`O +MK4"K5W6O;O;8P#B(7?J@CA)LR:44PD\W>-3__0V@7:MA$Z84%HADA>^W9`?V +MF,KT;S6:I/"5D! +MM!.V_TZSK3*>N]@88Z'''EY=!S^>$-:4@/C?CX*NTV`)H#=F!;2YH?SN+0`A +M_'1E)Q-JC'M_9\2]GP+N18,N8_.5,49=T(Z(P^8**P&44M6)#EJ`]J,`4,WW +MM'*RG#V6/Q%H?FI_?0UPYXU6G>14L4&DO>4]9F'?FZ!X%R,@B0G/\<*O8ZDQ +M"=[=0>'^/A9OSR;&'AQ;1\,J#J"QZCOIPI+HFW+1<9OV(]J$8/2L*P5::]#6 +M+I+U,":R]OT8@ZZ`:/D]CAL/RS@TWL8`*H2?PK$R@7>M++S[^IY>R7Q/AQU- +MSZ4T%E35LDX)IYW#H1^*8X\Z@03KX"2V=89=KP6^:M,C[CL-`+C"$BE5/'T` +M_'/MN=15!T3-]^4HLEZU+:Z>;)N5C!F)O=X`\7']3H77$&YCNW,55'?L/7=? +MM;UN2F&^BN:I@_V>]B4%WO_>/1#1$&?N_;XW%OK>S`PP:BR;)0*MU/QO_WJ_ +M^V*%U=ECHQ7\]_-:@=0KM/_P>\IHX8J@_:5%[;%W#/7&S./BR':O-?9K)A'6 +M>L^5\.,G)P4_"BNGU[@ZQ-(1SWA2:+L-EN2%!@61#AA,R[-JLX/?H@GY\?*> +M9(KY6;L()\Q"*5YCTBI)BQSO0SPTA*=BQ%EEU(]V64`U#G(.[GVPA/3@&!O/ +M)GD"@$4,)+[&/!3*>4,@6144@*)!<&GRNG,E&)6VB'"A/$0%LQ[(N`HKI%AQ +M8F$^Z[^GT2G1P/&M*;R/)H3-2<#FA&-L>!K_=!,CY[$!6SD.UFO$L,;D)"UN +M)_U:@&7;A;015Z)1]M9]3@-N7TVT\G+ZQ=QG'[8%EIQDS!XI`/@S!GY'3ZZ; +MJ`HK`/`>*09?G8;?G]<0RTX$O;7PTVGHC=WR\+UT,`$S%H(X@"^` +M_U0'_3A.IMAW:>ABF<,CS@:S3B&)`T1VC2@(NU2(\/NSYM>/B9^L9W0Z>1.= +MT\+>6'B;LDU7CJ"-7_[8R4?,,\S^W&X3YI4SWH$(:-9FP+$?)WNBEF^C&*"O.WFWI^;`)P2(W+_+,$8B+A149X$]+@UUEWV +M;4;]2C!/"5;+I69NN>&H\UW3AKZ8\RT;@1^9>7& +M"]`B"P"R9S%:YJJ4&G!C+/Q-_=&;S1A[F\'KWFD%OR\]@W=C"5Z=#H943`!P +M`N\YH&[EO5$**]1K8+R9QDLMSO9:[=J"B@YA"(5Y=;KJZ52,HWUBCBFA9[T* +M*_/8VBJG?W;EJT9YCPZ)*4U^/:H]+M&O'WXR4#7&'2LV:(F1DAJ]$&5=^GUR +M^5M)F:YB>.KL*?*44H-B2Y`6;HJ!_E@*Y68%N:'_/IX_P**Y.? +M@(;8YLH+X2O@Y95L"*&R`E\K[XEDCMPE@&3C<,6@7_[T-_+Y@Y&L?54][ +M`_K5P>]+!QE(AG":]RI.OK2<$X!_C:##<) +M.I_RRE]C,:*+3)80B.>V&#$@[@/RU+?$$Y0O"BM,43PYWZF_^1EH(8/IXH*0 +M*&X(*T3H.@U_CHC,GME[YH*#`NH(21Q^32]R[C6%1(4\1W]O`S\C>)]BV=_& +MP.^K@]^?;N5Y]]_[[V]@J=%J?[*][X$WGBY`JZ/ZVJ!]2J34:CA]0E3)$+`: +MXV/RLH=$E:3>Q%0\]YW!U67+].&'"-_(B?YI=>X.-P04ANFI1`VIH6NU*(AH +M'2L62? +MG%"[FG;%KZ,E@G_O'GY'\2:`P:/^[BW\OC3\WT\'_][])B<"QZ3OO][`JU.L +M4%-)F.($X"TI,);`C"">VU2);/1(\5H2UH1.69#CP;(9U)]G[6AJ.9QQT:-'XKS*P7M +M_$<(I&$P>^K61$FN)JYE$D!YL!D/2PD!U-!]T5AV(G'2:>CG_/?+0%9LP[3W +M8KUS%<:,4@-K21VO>_Y<;IH@5V"T+Y>7SWDI,` +MJ;@/* +M(/QT'?QT0S)J2`'5V(&"\*?#V1M=UXY.(%[/<=U$!-8.X]C:;4A9;GM.0%TI +M!*T4H$)0DW`>E;5_K75N4G9^]TOX4,VUBG,HM?"NGP4,GVO?INI(\+X'9-:T +MVY\V+KGP34D=N_71920#;G($2B(-F"0RG(5W<&V4/&[R.<:,*`HKW@#;@(9"$.3!KDAE60I*5D +M&UGRQ#Q*S2K.LW,IX*\;M+73%,=3PZB-M.M4K@D#.6MS +M-/\-*'LPQ/M9SN;5TIF5B@>>YP3.Z6#@)!J.\Q)7U>)^!L0`W@F?I0S7G8,%&53`?3_FO)&A*7MB5%RW!*B +M(/.P+P%#2X,ATRYCY=`#!45A&ZNR4CA^FR;E36"I$(-C5]90[&5'TT3)X1)( +M?G'@^K*_PU6X#GEM(+-4&@*!_+L\T?P"PO'%Q_O:6`O=1D$5-RJVT4VS:Q`0 +M06L-QD@GKP\<4C?1=@R5"BL^>6WKARK@"BL6(?C&HCSLA9+V!2(SOM1NL^&` +MD7'Q[X_@YZ6'&'LQ41P;^_-[Q>0\P\:YJX,>1N +M4D(3.68+/2&3]Q;M$&K(9=MN^"ZC&8G +M@PHK0MXZM.T;9-97W"B2;D=:'AE%N;&GWY)XLQ3][&B1\)O;M10$^_=;*I`)L($XO)04=O5\C@,X0505;54*W78 +MT6HNS_3*3.X,?2@#[>==N649&&<,_+XFII?A9THI0(!94(CC>Y\2)Z?[SFNW +M?7E)U<.6,IBTC!UY[;-J=^^K9G@&'Y]\P3K#/=1#[R1&]/#^Q_,W<^U6U>14 +MV?V#GW0=!K,L+ZV-^#46;P$I]X&@?:$WQ&+P'@.S\6178I)BPY9]>"YL!.+@ +M/1XS>C9HG\#9=%1:ZU(XQ`6;!D:SM2&^"V`_BL6$1KK(EU;P>G6;<:*5@M\? +MA'=OQP35];-SS/SD>:^D4!UY(.5K*?IVE61AD-#[TD:(*JI^NL.R2SR#DACW +M%F)CWY2P>F=H>74P_P!X.75H[)[NZ,$D2]HBF=@1/-[UUL"+!<"8YB>7L,'$ +MO[->"">0[P/Z5#)MR8;C;.!JC`55X!6-39-.JZ`83'CY.I#&D2'LKPW4UN^B +M:MZ^,ZS0VU@P]KT27'(W:K\O#2^MX(^A)S36@B:U45F]OL.C'6CWWVG)0M]; +MZ*V!NV&,%J=K-=ZYW6`\Z^\#5K^W/5+X(=9F'5+=@DB`3BXE6VWIZ]+[2BCU +MW/I*F"MBP':O*"M%!!5"O@9.@(,2H%6B<%GFVW`.,2/)O:%V)LA1;(V?'H2> +MWX8!R381[ON-M?`"O:IG*OPHOK$86$54CT'P7N39"_0A45I@9]-GPKF98S]* +M1)5R/8LYGG9NG$JHUD(B09-84Z<'P26_*%HK^$^ID:K0S"PO``HK_OWUH!1" +MIX>$UW@]4!2ZQ;8=$?.N>AN&&,U`\)H--KXWEBP9*LFN98^NT?R/74D +MG^N]ER2L$#X,-7%3K(+/4Y1^QH8@:()7W@A;Q")6IW.;1SZ??E'\1F +M?8O2[Z!,P!OZ-QL6DR@[@:P=PL`\K69:]RH[.)]H]5"I:N50.-#I2;WNJ;&^ +M)-=4LA^4WCA*_GU5PUQ[,^#VP\#33_#J],;[CN-IBU8X)J]:>'4**WIC1Q&E +M?AX;6@]_5K61%82`:FV<8FW86[L1E"IR`!V\)NUMVT_Q@NY+S+Q_^TC"+VJ< +MF%2C.HVH6#]7`7!O#Y3]CJ)J[ZZJIGK"+JHF8/2HT'D/DQ]NPOQN0WO():(* +M*U52MV58ES44X[Y-1,5-.8)U6B7,+L9=ZD$_I?>(P!*`KCW9.P5_?9WRU;(- +MRZ8?LN+Z6\WK6AN#T@U[:7B0L1;LGX6NTZSW'1%'^D@-@`"_2L';V)D#WAH# +M;S/<-P!]!6KD3$_9:;:\P;)?(Q%UX)FWLP(LYWPJ!14/"'FN,W#&'`!L0>V499XNF%YR4@V70'HR#,<.PQ7#I=; +MFQA!HM3F@16!8A16KP3:I[I;:U<2[C4NI0;/J[%E84S$,)7$*-WRYI*PWEL"8D)ACA@#.?:&6_L>D!/9#WYIT]P1_'()S\_8S@#N>SPB +M989.&@9#@AF)08_*E08E/R"I@;59WI?'!`,CH$UL`(`7U9#&C"=_%EIP81&2 +MBKTG2EF9V&2Y_W;C^',,2DW#TUL+K]*Q0>'1T74:C,#M3MPNCJLK1^OHQ1.G +MCK!3*IBIC7_-X]O38RUQ;<5*ZF'V'>EPHK4/YT&!'#XW]?SW]#@ +ME<:1\0M'@:7!&Z^\[E^S-K%.H4*!F)+-[Z1$[/[)Z2K4!D=7<7RVQK+1V'+1 +M"BM>CUWMVT%?DX3D3;]];RC2Y8`[HDX:S4$U3^#M0"OJ+%FOJN10P5&H9IT, +MM?X.BI,DT_=9K#A@67FBD&B%LS%QP?0L+H&NG"!,BI:K6KD`UP(0J%%GU55; +M=9]0,U2>/*NA9$07\'`)O-/O-YYQ4$X+^&WAJ%J.ZG:N$BPW]A"'NLWOQZ$> +MY+'1A`#:7(=$4FIJPQ#;P'#&R@`YND*CJ`HK`/1$V)C8PXHF=GJ?*D7P**R5]VV29 +M\]1*8_/0%>>:-DOH.&!\M\PB6+1NX6$,X:8]?="7"_YR"`U*E45+VE.:#.O_ +M/!O\>ONED+-"$7E]AD"C4TOBX.#"SB0TB)^R(1.1,GA81%K?KK0`3;T,4F.O +M0KJ*ROE:IL3`!>6L,_V\.G76=YROV0AER6 +MFZ9>N`G`6SN&SZQI(*>_:J7@OQ\%?WT/O;'BL6SFI&([+D!#6RBE9E"__.>< +MBJ*[5T575)J=FW-2/"WN!2("<@"Z!/"WZI,GKOVYSK1[66L5GC=VO\7+'EL# +M:M2_0TP=8\MHHZ0>KA:B2;%&PHJ#1%)V:D*#6`\P+O'A')BE*$`/`7"I$!(? +M!X]Q4!TIQ[I.'N,,@7.2("\[1YE))PD7&4-0.=T#\SG#:Y7[ +M_KU>P*MN'(X&]A,P_NL-*&.ATPHK.L8#CPCP\^I`*0M]OU5?S:F7M1:(80Q; +MTS*N?\;3C;8+^6B3QR!W%=4JLZ2;OC@$_"L`^YZ3DR.`=*F(5SW,=9UUI`9X +M[]*>I.E/BN[:JAI"1N&2N]14$`HKE(5J=\2]3=^:&<;W8KM@/@9NPXF@J231 +M%%#F`?FZ/,F0%<+L[Z4V)BU!.T42AP=@K9L8CI^7AO_]L_'LD?24W\S],SPJ +MOI>5Z/BYNBU#'JU@BP5C<,HLD&T**]%[F\$#OP#X=1^_M().#>JK;T]]=?_B +MYVRFG3D0S0L**SB`2E5$]S#^I.?`-=:(UFJJSP67ZF?:LQ(JIRE0 +M';BC;\U%(+;2HB0A+@`_B6L!G=<_M=PFD>;L"\IYX-U80F(W:A3DI^MS]6BGX>77P]^Z%J=_"8#)*"S+%%I"]@+G4 +MDW(5D;?ZSU-P;/WU%MX&H%-#"(WVDEA_7L//>V.&D!1+%:423;-"BNE:SA!DQSQ7ADDZGPEFY"2GV\4\`+W +M32JJ2NEJ[>)>+X<.T(\3QLP-<*XRWE[5TGCB3YZ`6VE(7TJ9-:=^J;K7,/A\ +M0O;`*--;`PHKU2S6--VG%8)6PS)A1\YSZ\65[]T<2=N?\\Q+YII(3`Q)@-NO +M*Z24;(>Q,C5$>F+K=L[[.>7-4`XH0F@-);$**ZG8WC.;G"UG^AH0I-:7,\![ +M3,DVI-!,%,*#Z_5_;R)I3>_[T>$TM7%+#"N&VJE#%?,\4'"G7M,[MOD[T0@< +M<,,2(_&2Y'KQI'R^_JNN-!BVPD*Q,J9"960;"$ER9R@T94^,.[=1V<:XAY,^ +M(0*4KW;UQLX`N\7UZ@:OZ@S*1L$KG+(`/<\79,R!JR1IG@6>-K\3GCS4*L,V +M=`.C-G"@?K2@%$*GU"J1%1$'956MQCD]>.V-M4`V[0_%1MSNGS`^KF1_[B[J +MPML,K$:#UWT-XI5"T`#P`CV">#LRO`QTB);RJ"Q;BE/5`EC#NI2Z#XM# +M-:\$[N\8CUQ*K??-&XLK;!`?`:9&P#U;[CKJ`3IF848W9B8Y(/#6DTT:NSU[ +MP!W>]W#B*7J@&KP_96$A:3I&F<<]O0%8WTY,/"I!'A_[-?H6LL-E:EQ:(70_ +M'71&P;]WG\TP$EI,OW%QVO/S7-M3NYV-M6`L@"(#J(:D5:44*+4^B=2H8*$3 +MU\LF?Z-P[,[/<5+Z<>2T9I29_K*N6UN;_&D`BPHKZWTW;NT'&-_/1C[]50FX +M\W+D*N7T8A(,(O)`(C\0I?&" +M1+RTT4"GALXRYRQ\Z.DO$0$"CD([2S(/SH()@Q0.C6(_2YB*"\Z7>V'C-5_$ +MCUP1!K\=:-XHT=93#@"+(!*MF$L6KZX:O'53#9"2X'WA;Q]%NW"](>`6HEP` +MS__,!Q%.EC57 +M0(?-:Q&^T=>;XEX55+#77 +M$#C?")'Q>-P&=9D?-KCF3O>HV3:BWP%BQT;.!IV+T1WL#CIK*&Y*L"[>U,?I +MDQHNCRDDM,3-M]7?QHE*5NM,U9RDGR +MX;S/?NN1OWK-L?^AY%/R)J$\J31&^,(+)'G`/5`?SD..S,Z'R'NGV,.OG+KG +M';V5&8>VU&]NF2Q9L&0'KV8-(Y.8(SZCE-8**WY^.OCWUS?)=ZDU1TOF?ZY" +M9TMVFKQWE@#%:&UV#*NP1Y.57;>ZY[NK1'I;AF&2AI0>D6[;G7QK>D9]/I]Y-_7U5QHPJ^:!@6RLM^AP5LC`99V'/'?9R9` +M/ZBIXLQNLG+ZKY);)T<#S8G2>T%BRWX^10WWIHFC;3<#^RDC[P3D]MC7F!,L +M=9HHW:C6JL<5DWMKSSOINNFVJ2A49A?'L8?H8^(7W*#9J[1:>D1^&P"?`6ZW +M?V+2D\W^&9A,21#O>\(=][[+"BLS+=RI=XL$F4`F!'7UJ[<6?BH9&F1LK62> +MO#H-9F2?J6',:@&DUHJK9YT&E&QNLM]5<2_$E64!]`!H,;9_/&1QO/K&[-.< +M2HQY<82.>HH\&J.AQQYCWAGQO49G' +MZ\C&9Y-T*&O<"BLP=]U!'>)OIX!2Z@;@@BS1-<2+GMX8K./>,;P/2;:7-`Y= +M^NS5KXD[6QUA6"(4L*].@_FS5<$,I&IC```@`$E$051C"BN(G`FH2E4V6Y5A +MK_H>E[]T5O-21CE;M_D5^GGO&O7-U],6N\U[87MNO4"E^BA7L`-GE*MD[':Q +MY`V_4)S0`6Z4Y<+>[A#M(G>_[R6M);8A;3PI/_5T1$<)P081>"%+$G!7$JHA#:5)]4E)8H[TZ+LW%GXJ<+JSWW&SPHB"@ZK3 +M@TA/;VSP7;FT?RD6B]P-NDJ$%%7/I_&3&J%<8(H#D%,"4VZ8A*@^3,)Q[KM# +MQ>V;]CYYL1H^R";V!`< +M%"=MBA1+A??[,>YAM52JPK5^)Z,I*7]?R"Y3V],R):H^H/TXD'6E6/^2>_:6 +M_XS$,6:6/,"ZVI;QFE[W'$[T3P7O1XKF/O-5[=TQXO:1&<**^*6)2O2IE!4>@HKVN"P3D9)?5#\?.X) +M;`U;C4P#8&'_+6V'D39%07O?&5@0\W>/@*%P[3[#9M;^W@HK*(W&#[W101"=IG8? +M)0R`10P"Q!P^^E"9++AJT:$R(@G>E^!HER9[[ZG3EMXN'9J#B"`]4Y*(QBRD +M"9!1TNV+]1A0Q-L1J>,MI5Z:H\0:]3U!.($S-J;%ZJ-$Z[G. +M4;$(Z/M*`7LJ7*(T435G_+B)JJ$VEFZG/QV\YZYYI7-\YG%'E29]1\*HQSVT +M*+0P9B4-<3E*(6HW>#A@O0;?:\GK$)][U(/-&).<1%4IYWSX7FZS(&!)^!#K +M\>XM=%H?_MW>6-!:S2VME`*M%1ACL^V`Y/>M8Z-C(G!G>UK.?$\.56=I&[>N +M^Q6\96?U>PHKM,:`V'/E;TX^K8[/6&AOYTK'WB]GH&.!>&Z0=:1^N`=J/8UJ0>MV/B$^?UY8/`N@M9.Q+ +M[[!OZ;CK="!P>W44(UQ(KN"U^K9$H%!8 +M3A@\(_,<1@`_[W'/4UR5*:W*/?"IC<&QR35'&WDB@-X8^%'=H771"BOAWU\/ +M2BGH1C[Y3BEX(X*EL+!:BM=W`JM$YX'V((`_:8$^]SIK2:LV=#SNH>1%+VDEXFEOL>@KB.@3`>\[@R8V;I.QW[-^5\X(H\EC"'(:> +MFHPU$@:@DK2[WEAX=;+87#9\+'^R@%(**Q`1_MX]`,(0KH,(G5;PUQMQ_4,` +M11(GR&W(2]R[G/;YX9"Y:.0\== +M8R$G'EZ*ZK?;.MZMN*FJ?JJ7&_/YN\IZQTOE +MPD<25ALA#SSL2[+9ZSRCC'(FV^2#=OB6"(PUFUAW)&8^TG[0#@"@$$&/3#)_ +M[QZL)7AU&K36@,;NG%/Y26M'YM'$XN&#"U91*%"9UW.O=[<5B"WY3LW#]Y@> +MP16=25=8TQ`Q6]%T;UGBSV#5[SY>Y>=JN3X@U:*DBB.XKFR1 +M5G_O.CW&M"/TQH(Q%CJM&(GU[`\M];A8$F-J@U`SM$0ZCO>T06T5ZS,V#7<" +MX'OB9@\M9^88?M;M.N/ASIL(-V*H)7G`L^E:7QT**QJ-#O"RE+SCMAV80WLH +M85R!M&KIYET"P)TK@!1^![)T9+G?I972*K^AJ=3LM[CLF"RJM9*#[VGWE@': +MW>,ZK10HK<#:Y13C/2:G'C'OSP1=9Y4M%NJTAV.]1GU:@78)N)&]JUP9]GQ@ +M>KRK(1;6XK?+`Z">RYU?-;CT[S$OS]^,=2+C/0*EVIX:,=#XTDL"@BGQS#2Y +M-LJEHF^!#$B+[D>6%2;U?0G?^B=EM>?N_R:*QOIS*1PWWFD-?[9ORIB1X_$[ +M`D#$O.YK@;2;++>50;LD";D6H/RN&7[.V)"$RCS>S^=ZQL,Y;=%1X(/SHC@N +M_EC)(&.E>_:`$C^A1%H7A3"R9ZR!M`&:17.6WWG?(G224KWD7T2P9!F!(#4; +M<`(`BUMQHSGTA6@LFUH!90L`0,H16Z+``C'<2].`FY)/QG;F0F2F/\DK$R`" +M6G2^-]49AV^`+.9\'O@**QW^>!P$A&BM_K=E,.4F#C&*KO$=/Z!@L7CAJ`/,?#1+"5V_7MC8*XN-)BE\VV +MSS9JIM*6J75R@()W$2`2\$JEN7VHG#5@N*SEJ%06$[,2)B12%DE3=^9Z3G$U$H)1B3KYC[:+&=]@-;EC* +MH)SZ6E&;)NE=B8)BF9($UO7[[6;IX-3*23`-R;:-YMBVBQ)\;]N'4DI6J1BH +MW^82%K:.7=1ND&!Z.]^)P,N_AJ!C9\!@4U=T_ +M45B7A2L(!K<"Y"T,G[BK[XV%WY%;G?:_5/3=`;R;9D:VY;M*OUNRV6]9K[.2 +M<\.P=MF1AADICNWW3UN[^/K0U]3_N>XX:*\Q5[?OIQ/F:M[:'G2>E2X`K1*C +MQ!Z>((J[(FC?>N%3H)A]%K=QZEM`OQ94`DI_-_9W2=(H138C!.&Z<\]P\>P@ +MBJ%+J\9^VH(]U:DW%GXZWMN194M9YIYN +MAA*#2[WK-<%RK8W)->)?I:%`%=7U`HX9:3L\H0O/=8FUZH.\9BTU+:3@O6OI +M46HJG@+WP)U":]?*IKBR\20$LS[33$S/>X8 +MWKBD-@_\??O#5S[-0!(1]-;"J]/ELV)SVD;1?3$BPDMK^&?[)."J9>AJQ`WN +M3:;$`085R)@GP3U2/&DIYY=(?*,=4YZ +MTK"K7"H<9X9)@, +M]]ZCJ`*?4(\Z?2&SI_7H]XJ?.]!.U][47/5=(0Q6*DCV.9M!*KI#&KO>"BM[V351 +M$Y8X">!%Q@WE[Q,DI;96,(PG^Y2!-&L)C+6@(@PS61X-3-/H(0+\=!W\S[ZS +M^S87>.ZV31DL*J%$5TG2ZQY;-B<**]+^^N2"OM3[D@EOA7,(#](**RE]1_XW +MC@,T)0FAJ74NEK0I;2=.]7&MMDG!R/OB\7W<\]L?B^.<;_6HGK&^'KW!GZ4JL2F*M.O +MU%J!5@HKC+67:IM6'M_V]@ZKL>'65+J.O6L:A_IF0DQE]%%AO3P)(#-Z#[]YX +MW)]3GA#6>?>V"+CON91">'4:_KW[RRU<1[SG[J,1=^IA9#U_V:33:[3G,EPS_A""BL,P$G8:55/7/Z]BL7W8[QP +M^5FPSMNP&`)'G"N4?`HK.&HE(63E9:.[B1G'U\9SX&]ZB)<[F9EW8AL=[M]A +M+V!JWOM]S@U1I'5X'=6R"P1`QH+M/3557!H6H7:2Y1@FH15T5D%O3&R*9;]? +M8L19*D2GWU/QZ;'WR4,)R<>E:ZP:B7K`@&?O?74NF). +MQ!A3G)Z4?--R1FPMWT88=2PLGRQ+8O7?$Y1OHZFZ:S'+69V&*6>WV]B4H(NS +M=J,[O^Z9,A8P(F7N\%:%6IF"\?T1E5$B!Z1OV)\W7FZV3(*DD>WO<17*PXT" +MZ[31\F?\_2M*RA"B\5HCQK)#E4?<'H?89C';M%6=`8Z6X-V/##,0M?V5/3T` +M/R\-QIBYSX_RCNSE^-X3QSXDU%F`X`(_M@5C?+:;C;;@^UI7H=)F)7#:PLO9 +M1F3;(43\QD[4 +M7KP$\.II!A!OWH_"O!9,ETA1H/3H;8:!^('E`G>9(E[:8,DG+E4?:+D+_5$+ +M4HA_W$\T#7M8!+'>3`B*NT.+NR, +MB&"LA=Y8Z#I]J$@9(@[Q[F/(S%X!MUQ`[;-;I7C.?<"QAP:7"BOL5T9K^5LCP]5QU@?:=V3[&EE-)1[P'21XS=EF_OA",F +M6HB]QYBUC,Q5O!)$*4`>?L:/>T\":1#&I`=87KARIN+/.2\^!ZI#RJO)S0AL +MCPHKI?WZQ(D.5V\L:*T/C[_66H'JL:J/:"_(#P&-4'A)KD'?>Q)3N:_6/W!YEUCN/A[(YVFH-7NQPK;5<2))`]:8.%TW#AF_6`NYGB9)\ +MZA5BEG`HKVGUVJ[V\YT*_AFA^2[SJ*0!^=WO;0@WW`6M6"%[PX'(]U]W!>ZMO +M2KG+2W16^#RCPK%_47/;@>C(RVX6)J6V<5HM$WM*B?ZY)"_*^(;_KA#+R^3Y +MEOH:>8I'S+S?!^QQYA?:O`=6C"WL,YN_8U!`*+:A"/61_R?0_=[T^QZ$Y.VR`B]+V!WM@J[Y("W9R^*P'`LOLPN5A@ +M(AESLDU*J:+%TG_.?6?L7;4W`NG3"]D&7Y*H7+INU.W[LK6>=MJ/7&`T/+M? +M2$=:+HZ*,.;!+1-"I.BXD"17'K517;=WF:!5R[JDUJ8]=F/OV%K/&Q2*>'[. +MI@R="BM-8[V3ON@;'>O1`4<@5$QEP#>D/]I*3BF_WL/A3U%H",\6Z'U`V"6C_CL3+-LZ+RW^GL5C5<[K[7,^X^(RU +MBG>H5%KL3Q@.BODH-L0NG=R#05\_67SN\_!]`A",'*A%UD,>5RW%S7L(9,FI +MDGLVWZ4T&)^2;Y,G`(%3@?4S#Y"+>952SPT,,[I9,T[?4YCFK]R:&_P0@.GVW +MG+_]6ANF[S$8WP4([S;O'R#?8A-$35_5]B11]NYNVU/M(W&U;F[(8P4E)0#GKFX^&VYW=_0_"U:_6R]`9AXWAGN=P;PD_L>ER]= +M1*^(2YE#FXFI3)['/[;9\3GJ"=8B5\.?4_+?YP)XE,P97`24T^>V;)5Z"8V!RDX7)%R!=XHRUY11M])^VLKA(B)^XX+J4S5 +MXU.3=5O4:Y/K)ARGJ3S"#'+)]"1O(HL_EYQV*`G$PVWY( +M%R8$7N`'N(5BW2I`+#D^[AYD06\UNJ)+N"K[4CHU"BNH+G4@I`50XZ2$A0M( +M10+KA)=0X+B$0,W=9X&6]ZQ$CA`FE@&W'A;7BJ_KC42\WC!^!T;ULZT2*2YE +M$K:MJRRZ3%JUL<#^^$B%^TBST'.36UMY&A`1@&QRILWPBO*GJJ5!E.GGU64! +M1IZ>BZ(>`H4**WZZ#O[>/3^&,XQ92)4Q!4KQ_]O[LBW)45A;R>&L.N?_/_:> +MKHQ`]\$3@P"!P5.(7KTJ,\.!&<66D+03,BAEU>;GF^MS^#X6_I+W7MRO2+1B +M&[5SWJ/H>R;L'*463&A`0&P#X%-[,VP[BMZ'4J*51HHAMNRWS]M!?F!T.6C? +M&#Q1:$1SFX,4"Y"EX-\L>!>,`W*J904.B#$62X*<4\SKR]^F.J^G%-:PI$K\ +MV!&Q:5`\"BO`-H*,U'`0S@%"IM\1Y=@_JT0XA"8W&/?/UKDVOV=L99UJ:3LZ +M4H-N`>A=X!@"26))F;;)),P`3"\`==/,L"B5H@SP4D"RQ`)N3T/.+4K6%:/L,S +MQ7X;:)]V+YP.1R+TD+V-)ZFF-F +ME;2KY4'12N;N)=T[[DR0RA6ZK;QXHA&C?$PT`]G5P7L,L#;/*G,"[FPA3V.W +M-"QPES2B.@*X(M?R'4%[J55;3I!$#NLI>!EDP/*A3V5K@83EF\O3SK4W!_HE +MRHI(B:E8+T\%\*W+^V-@_!AX10)()6`&16X',W@?7X`XP+_WNVJ.6I#U[`&] +M2^[KO7-9`L2/\('/R?=>!QK.Z$KQU;-`F);[:3F.F^\!ZT9B<9>E3Y3)#Y$$ +MP[9]V?,]WRTT-S`D.228!*Y]NWW038WJ?ZW7`N]#M$60$E:Q^_[`\,P"#)J +M49B",A(RDP+SPP#P9WS!O_='[-^>(HFIM?266K$Y]QF.I,37;TH#9&-^D-%W +M[5P[J3;$#A&I,4<2L]!R#^S9-SEBJ-1Z[&&6AX+@^- +MC,^M<*4\.#4=6[#\;5A"=^S_.=B>?::EE0:VP^Q,PI8:PJ#<]V(N*OXSFV][ +M3,-$!V"5M#_.D$8`TH#5BK',,^'YOR^N1^<$DAX%IH4CV.0]'V/@(T@/*1U. +M'[3;33%$\'__?N&_W_>E"-SVR!1.)BV_EBH5$H;8LV1?;$[]]DM21)[?+W+^ +MWX(#">2N-/OZS'VWQ]C%QT^6:O2H.9&X^VS/]`-A)0HK4XO;L/KOW><\.]OU +M66*<.%(V]5@KXQ4'?LHTAH=>Y8B`)*+(QSWX'--N(X09D,^XK"RI("7YV5-] +MDKGQ9!A8*WW<4T&Y6C@@W6:F`$]CVKC*B)Z[ +MT*'2(R=]SII7(M=RAYPT0/<2YX9X;:J\N6IA;P)0I^R.\UB204P.#3%PEA$! +M]26O=*$,X_H@Z4NI7"XMXQ4L):FKO;-!G928B#L2DD1&%*"R*,$5`>,V@N[W +M4B"=0.:7W]O'G2.8XC/N:.%3I+8I"RG3GV%,:\\9-YB<)0@!8'P-N[/+M!"` +MM=?48DL#Y*^"6_6WU&5H_WCSR.D;,YC4QG^5'/9:U%__B7LE^[Q@N@GSAB1D +MZN(\>R7\!JVLY:W7\SBTFZ4N2O&9&[C?"-;/5RMZ$`M&O*N#1`;G=E_'Y_X#4,;*"J;=VH$59V +MN\;7`.^/V=768J;5P]/EM2E8;)7VG_C^2'!`0`8?8!1),YJRC-QU$@7(DP.?#2+"XK.)4`[J!-PT2< +M1+0E\Y`BOQD\\A1)LK19`Q!V(I +M(_)=` +M(?!K_ +M'/"G)`@-V\;E9:?L)D`@,JM5/M:.I,+B_9V$&W51%1R%HT`IXBG0\TZ,/3/( +M?)LE9#W*C8'WYP,_XXO5/U/#6B++?L87&+,IBCU!7[F53G;3$W-]R?GA][2V +M[G7!.2M_LA;I9/6=&GZO7-"AW&O2U2WQO=H7UHN'O9NKOU?`ZT_\B$YP9UA^XB;"!HY"OGYV3 +MG#]Z69"I'ZC*I6F4_)MBD)6"]M8YW(_(7YOS23[B*CWVCM_%968H$89E[QX0 +MX>76T0:6TO$;^:`J:M*8.UE".:OQXJ(BR>_.D2))0"CW +M>U$^^0C@]T&R+/L,9@)J%]>8LJ#=%M;Q.Y,NG2ELQL#'M)$MDF>;Y,>',E<6*9B//5=*_]WK(,GU\1K[KZ5U^'KLJ@HKVK6D +ME/\SMV#8EOT9`%.YS&MQYM&,TE+#3JP/TO>/O:]RJWRL`(\56A&+-X=C1*XD +M`L`:D0G%/@*I-*]QC4';&FUX#HO0"["7/JQ0/`KF(IX +MKY@^V$3`_8PO,+_OC`O./MX&R0U'2T%])0M06"TV7Y-GC-RGPNC>1=#':]72;'L\!";C(D@2O-%K1%`6P?_%7D +MW!'W%D1,NJJDK.TEEAG.XLZ]YVC!BQZRV%R!:+?_.EH9C=(W'7CIS=V[SI16 +M__O^P#@,S9@@N?(:!AB'%_Q&"*!JV%2E]?!,J()QI#J+2,NYX7<\Y\[GO^]5 +M-8>EP6Y'@7F.[?1,B]H^A"7MLWS[K;_C07NY9:#&CUW:MR:^^+NHU(_;APBHVU[+HX"TYIN_ +MQWE9-4<25M:K`O?#RT%[(.V/+;0D^R":,`Z4[=2/$1*D=/W`UL?6:I]S?I,:N`[=T75:V +ME95T:7D?SI_C!EYM2SY'HT(+T1)-A$>PYD_G?=0-^'G@/>]#3`7#(FO=7VX. +M;'H6CGXDZB:$:`7.`DC=8CA%(KRT6,;8RT$?'(J4/2B/%+B;I9=;X*TV-7F; +M"(OD#LW@_7_^C%%%,&BU/=Q"EY`_2VYW8];OH*1'"Z^9Y\=:%22:$G;$9L$5 +MK5V6S94UXH0'">8$/LD!'9%Q\O%/[=K6!C59SP)PLXPGEM0=6\_,NDOL^I9` +M&F,O=B8'D\=8V='&!^G5!13[1A<_3H*VXVLE]^+72(R&"BN9.2<(_>O#6`Q@ +MW"C]?8H":23S0^VS:DZ/WV^>EPIR%DC6[MSBYW];*D@9". +M"XS+BQZW[U-;6Z>6/$+1Y&XER5OU(_J;KD;;W&D7"`:WX2*4;%":@>8**Z0C +M[&A$-FC,Q*.(C"SADAU4HI?LO*)@/NEH2SJN5J1U/-&3Y]O8D*LI!S.! +M[*$?C#L+#'!5#C:YBX["P(,9?W7DU@?GBXJKMAZ3^27K0P3X'5BZ;4A?22>1 +MK*+9<($9\\81YQ9/RHE05:ZZ,7&ZB6MECM:+G3*XO8WC(>WKPN>B`C^_7[@[\_8)47^TLYQ +M?(&AR[#0/1]W]?U3H%Q,0]I +M;F6T/Z`UB%`+MSXTR/0>2H#.S0S`(8I\+"2H?#]==*V7@7H"GG\4@5M?[,[G,O(8A.GY[02WBQ*KZ^_N60;K(^Z36\B5@ +M3'HH<`0L-<&Q.9F9(BYI18KDUW4%J],1Z]@9*RMHLH3(JZ6DP*H='[;+)PW, +MR;08D5ELC?4&LB7U[_4=ENZ?%$:I#5!M0<0D(Z@[!@3OO:&H):,[PW4E9QAJ +M)<,0W:0;GJG&\IP`&/9*F:M>-\A)AZBJ#DE.=V`BY9WL+VP^>5D;;$4@YYY" +M47;2>,I+BBHMU'5>M,0WX9*M))>UI.T^`OCW^^D^;^-K@/$U7&.DB]UCL%F] +MV:PRD#?*GR&3[W3M+`'MU]CQSY^+*ZXW=:O2]>)_]^AS-R8,5A=3+-#T8QI7 +M<_^P$_*X9UU2/!_QM"*`&TCW+?)B1M8R=E*9A3WNW\[ZX2.G)$#@X\[^6Y%R +M2TMJOYTGQ`P1_'M_X,_/V#47SL_X@@\1&$,GC7$],ZIDC/<&P&W?H^JYW9,^ +ML\5ZNJ*%_[+&)Q5[V7E\ZKG2)`N2EOLI=E;:33?ENGNS-B)/X1FB!HP?0G?; +M/"R#*/(^Y3F`&KK#H`O2,1($FW)909GKBR_<\[<`^>#4-=.-U\XMJXP`M`,H +M:.\B',X;Q_?'P#"8P-^]Y=PB(OP=1_A__WXO#>QJ74UZ7O.6^/5C!T(1^3E` +M-]AG6NX"VI\>5*H^]]\G(^QTD-O?W!2H@[BB'9_7M?PX\%[S3(K15/06%)%7%=JM_,,1L8@S8P^(/P*TEZ_E[7]`"BO_5]#>]6QKN=Y.VYO.SX(V +MXCW/#54NSSUW+W/V6'\;"66M'2(9#3FL]@$UL8N`#!,8B0MK86PEP_=>`V5J]OF(F73(S +MK1*;QQW`H$>D1!3-Z[[-P^"I#.&U.\'@,G010]5$;I:A@&,/<=(.34[9$<0( +M6'//*@OHRF27$(RA:KQL3GB.(=$?$XEO-0D#%;&J7023O_O__-D4AT'@>B$) +M5K4M:']^1J`E121.@;&&*!HH'@(-2LN$"(%,#4`J`;`#(T`Q&`=*S@.G>)^= +M>6&3-1\1J&?E[$&`9D^`6K,`-$@'%-<&7R:_1S$P3G/?-CG#M8.S_&*C\S[5 +MAUCP.QF71"Q\N[%DBKWN,-O^E#=!:9]C-P/.[P[+>&J=85(N^-#-3I;!G8,M +MYB_E$M@"L$IB%7L$B[KG<"MYBJ(]SQWU"_9:(J&&O1W;.MA0-:'4X5"8F20! +M#N-$2U;V`8IG>8D1&,7:[)]<.8(E[EGN9RFY44EN^%3N^E3_4NW1TM\&Y5OE +M?1"U%^P8(OCO]].58AL!X,_/"P;$->,,1L!^N;67%YZQ\>II^8)EML2>T//B$^^+U8?=UW*,Q^32MSY_#]V;_OI +M1N\NK]0`I.=@2F8>PW8K&RT4\F_LW0O+SZ.D$;D-=,@F*ZR^!+S;8#I)0)2Q +ME+MYV!/CQP6U$@:W`!+E01J<*AD;.WUE$IBC1-&YGB;\#<>`Q/]9LE4Q`V#> +M[\\$KID4CJT$Z9(>$F<@;X":LI(B`B;? +MW:''&+68&[N=3P'O=S`(W:W0"?N_QQQ^F[7=!N_#YL,3_Y\;'_^@:S&(ZO;\&XT1RO._)J[[G("AU;^!<(_:GA>R3WG'/HFGB +M\M'PD&Z5`:C5^%*!##QB1E/GJ;3/$L*G'GNJM%V]MTCU&NV\)Y]U#AYM>*"& +M\][.]W^4TD_G?"F=<,<"5D+QYYGOY5C.6ELC@M2/;)ML)0&8,A=O$Y +M`@P56OVP+5%"=@>C0%DEQG(AM4+WM%9+SG+*W'+$SN%:%E6<\U_O";*LO8G) +MM3'%>6-CI]:W)1(VU2/62ZULZGWFBFXIYP%LX5=/#"LJ)[LE8S->&="4^J:S +M?ROPJ5Y0:#? +MY[W+SX9H`N\_KZY9/A`!7J\!S-MT'\^SR(F^80UI*9@C@1*@180YJ\B+.KL-9W5CG@@35P +MV6_0_AXD`7EJK"0^[K'QS,4,7-''_;H`Z=Q@Q+U]^A@#_]X`?W^PV`HK75+& +MX05O-,TRVN1<3EH**^F2O.W?!MCW)DC(?>>N2LI5S2!7Q0Q:M#Q%=L8\1I:? +MATN.$-6!]]C?9*D4*03VE',%8?*G`^,:(TCQR"HM`-GTBP"2##+YL>(4BIQ0 +MWG/5J64?R.PO1/AKQ!BP?7\,_%9:PZ7]00087VTRV7#!M[W2C*G5_9CV/^T6 +M`>%\TC4M6K[\Y&V8KK5L/Z?.6U%6F0W8V@?Z$#7CIX&<#4>M[]-$/@0Q=Y'` +MVHOK:"PD!OXS"Q`U"&LF%SL4E6;_,IC?OP'UA4R)UM2+TY^\O=4SUF97$ +M"8&6NM8WO6"C!2*@A7%IS20S/6>,"[C-TH>YK>OH>X&N]HC2).XM0([@TE1, +M[U_;@>3XS:>`O;^8(7`+XE-:II2GW&=2I8!0XC^,6\H];QQVTG6NQJHDNHJ6WEL0(I?\U4@+Y/P%,.@*E@Y6V&C3WLKZG/AZ&S +M+4JB8#)<(EBXYWTCCS_&]ME+&4M=:IVXSZ-0'AH6W-C]PLB)'XREP/<]%R.R +M&-FFG8,KCF");-#&,>Y>PY4P<1^95.HSUNW4VJ=E?NZ8W6VE1]N9F7R.2+5: +M$C-4T@8Y"50\8+HD_JQ0RE'1$N('F:HP#G&+,O*,`V31_=L"WMUC'X$RS+`A +MV/390S>&5""T%(C`OL>.&/<^$X#R^$&X?>Z_*_8>[U_!J4MKI]'J%U:!QE;E +M26G/."V[3Y&QP95:H*=,,Q_X&%,,=DIPTY_74"1`CG120?1W!4%;]KVT=:;4 +M.FMS01QCOX+[$J@TS!I2N^=K`\!+Q[EIRM/"#W;?I-">:90ISC=9L$U!\U<6 +M;"=KFRS>N8QW']B@**RW;13.SZM\?A->`F^QKV+?7:X"1"-X?E^WZIY<>X0OP9=P-S:^`N(EF*9&;Q +M28R".H`G8_*SQS"-9*IQ15``7L_ +M8704@4IKT&ZOJ7^_;_C[9X2A$S#\&5_P,6T"55O2S5^-,?2J`'(O:+\[R=!9 +M>U[+M=:`SOG5]^])!,9(RI(FTIZVEGV;6%M?EQCO*^2+ +MZ7M]V[Z=K0"\[OGO:=,3Y_LJV::T\/+IJK*V23K($K(C.Q`F_IXPJ**U=IK* +MV;X%C$Q],+//+N=R8_]OYH#3)7C4^'VE.)#VV[:T@7N?"[9]!:(L3[T/0,@+ +MNK3[OE=IDA,N\#+IOGW.Y1;!`SZY6,,_/=^P__^ +M_"39ETO>XT36CR\PC,O,#(,JRN\>29 +M/M>,"3'!R[FU[@>MEYQ7H;$O'X#[M-N`^K@/.J&-^7F^I*M,BH@HE^*0VQ2I +MO.3QJ>$LU';(63F0)1#F4Q<"X#Q[:0DPE-=[T:TIV&3'YY>_B^4J907=TX?/ +MQ\!_^(:_X]B<2P9A;D[^#^KW((YU1>:)6R@?I"IXW,.H<^[HQA@8I'2$J@9`^G$ +MUB\!^44LIU.6'@&,'9#>3<6V>%U)H"#:_A3C:QRL8_3[SO<0UISV][2XJY;>LIVUP7.Q_KX_!A`_\&=\M1=B +MPP!F?,'O^R/JD\1%YTQ+=FG0<&IN[FIQCX'Y%O569Y@@.M3JKN)7RU$RABK< +MW+X"(WBW$U=Q(1IC.@9GBTDU6M*5Z;M#]F%:S0VP\9=8Q$C22%_7LAR2"-%" +M@@04^HP#K+0JM@U]8T>U,S3;+C0ST=+2?J>^B$\]N)F>#8##VQ+T!?P;"'_6 +M-L*E@-4U.7(;48QWN1!5F$H5,4X!@U3\+UUX1V<;AZ>T*A3`:4"`F3I*?=$Q +M\O(%6.?!>\RE*3[>?\87$!%\3-H53`+.G69]1XQY\+"BO2-W$NT5X[`+G+7QO2]/"U +MX]T3H`7M38RH9IZ!3CNM_CR]PGX<$3(GO048DPQFS&OX](R8]+U>K<3;23-? +M&=*::C$G.US+,@/6YW;X3*FK)=TF;4*<@TQQY3W=+.EH^=`#+$EZ?("\*`9Q +MI60HK`X:`?3OI^760#+1E`7R>=Y&` +MP"=%)6PO1*5!2'VV-3:K)6QFB,Q$/9G73(J)$2-W^2GK_61YQQ6\;Y^YJ[,$ +M#RX6D;_C"&9A39TM)8@`A@#^_;Z#-2AAV42@*FR:`I:E>?'#Y_U`M7C;&2KJ +M)JOO2#>670&[?I[L:&"^#.#YS*70(6%"BSJ6;!?E=5+D'-D".<-Z90R=2<,? +MHU1+G]W..>]=HC@T%+576GG\PW/;PP_OTSP;O1>WA +MGJ6TE1\1X<_/"/_]>T\6^8Z@?2^IE=Q21/?<$P>LT;N#UQI+N;I4W'?N=+SR +MMQ.E:96?7BY%P&1;W+-6]2*+,K%G7S8H-.+BPC&G2G*44P%S:E1A@#8I'=E^ +M`8GZH^4Z0L\E@;B7,/M]?^#W\]F-`P-"$P9((R+\_+RZ"/QEWTB).[0)Y-4"V*J;UU?=+$U>.UYH,OMV1+9R1EIKD8^U]>UUB-@R@&T5%:2G'O( +M6K\($)83#:1`,P%'9`1IO_-(GYR4D@1L=ID4@&;K@SR0CVGR1)'@N8C/77), +M(RDN`YA"D%52?$TZ-B\2Y:6=9I]?+S6';+P.X14YR40M5::EJ@F.E&096/9S +MSH+,^Z3B#-X-`'S@SSBDVQM]1[C.8E>JX^L%1!`2-J7\4*EN/$NOS)OGEM]Q +M0->VA>MSS^P\8M_XBX`3R?E:TS_)NW+^VJ66XA9N/3&%)=J.8<=+\GD4'IQ`HK5[Y=EP:E'V6AYTB3]O1'.N]CR:+< +M`ZHDZ0YKZ_+_[C*@RH,HW=^WN>"LWK:EK<2JS0%\)Y!5F(K1/I1(.$;YN7U^ +M:J=CN]CRA<>"L)KZI>D7_=\GMQF"GW&`(1^AQ)ZV4O_'G]FOW@?OM>.V@'L" +MVE?'SO6`C4B@CK16/<$ZO"=%ZA5!T5FWJSE#3XY_H>Z=]7P!1.?F]M:;NSN. +M#S7;@Y?T<5^RR4B917.6\YB/.^N"@NYWHJXR4\J9`+P3Y*WLH=#W6%F+\M,C +MJPP$[Q74I^7"@@!=KKON[;'>M]=O6_+<[_L#1`;^_HR%/N]AGMV<0O$SC@#P +MSH)WN3C>3^14`SI:*'8MUWA+QMTG`'8MUY7C=PPBE=QR]`Z0K;^-4R#?LEP" +MN*=82Z6N)S9X#<$VEY8RW89\YAO.2AX7[+E`6RZEEJ3/*3`?V^31>I\NM1_0 +MP6LPK[8#[':9@/1G!N_U;D96C7S.<"WW +ME:-WG<;<&LP#?%V_=R_#%1N5\[/F_,_3SW$".1U,2A0']\O:9X,YV;HR5G,K +M/[T$G+OOXSXG44YU@!K+^XTU5[U=+!JJFFPI$I>55%T?8^#?[[OX4"U-%8:` +M\/-ZP?#J(P)C0;*MZ]\;C-6CG4^UM-?ZHVJYYASRL31TW[:+]^%W9(:[4K!J +MZS+FTO#O6<;20!%"]UT(",;%I2QKZ,RAM+F]>.RFL&C5A!9)$@#0P+1M85*U +M^KR`ZODO9B4>FM<^$9B54&H.G"&TB)*V36(\DJ6M#QCFF9]SN!L8K';;6K1- +M&+6,%;K6=MS20*;F(:V]#X&KD?30,C$%Q/F7DM:`+9]^GO2'NV4(`*-0,,>4 +MGG@0X]QG8]RKROF_O)3)MVD0!KQ*+(,L%#KV-`7A_X`^3 +M!6;`,(@U%]P=L[H/B/"_XPB_GT_H-K/,=\1/W_F;Y:Z#B;2KJ7&*$5%%YUQ` +MJE4#I/>`T9:W+U*6VYHV2OV3<^0YK:SO$A>(VB#0TB!2'`#(+'60)?^G11<5 +MOV#?#/-+)DK3.'$,M_'O<4L`E\UF;FY"]FYKLF;.5]Q*D+#T3 +M$8?L^.PV-TD!79+R'F1^W4$>=X@'CFX/HB"8U7ELF;$M;^C#+79B*3JT/M>5C#/SW^P9CJ'S<$VN(.[#^C&.03_YH +MDB`M^ZR+6JXU7ZAK]++MQ0;]C6&5)]]"76F.=_FX&;*"Y.B>?>G0(EPBF:ST[:XSMTK(I!4R^=,J0-TFMX%)&U$10*Q4P +MN0*&P.UT56'#6JIB+TG^_'_@9`<:(/WJ)E=WYS'O?:QA@ +M^#/`YV/@8P@,$:@;\S76K0:%WG#>Z+OZ?.7UV:N-3[\9PXO.\Y@".I(&2E,3 +M%6E2!7[5*5<9VQ4FE]?<43I@\DEWE1+A.!#CH4HD_[[S'12]3S*NI?GA(Y^> +M"BO>]PL&.K3MM:_C7%J^";1P??_]?0/1"_Z.8U/EB8N#&%\#C"^8P+N9?>YO +MHA`]=3U<=?V7D'%]UQS=:W_4S%&O==E3MK3*II,BUGO4>C_-ESZ=0G-D02Q) +M4IMY$Q1Q7;$G.$;R4\L8QI(F,:"=`_HAJ)[:9XC`>)9WARU5`)J)8U1%N2(D +M)?5P+?_[A!4BG](NB$?P7&CV^-N7MN],4%#Z?CM`M:9N2;JOEFW.!>(Y?:K, +MUYT+W$P&[\"4+A+I#3_C:W_.\]9' +M[1[RK_-;CGDUPR5G3@@C^&3&M$S?8V48!O%YD^O3$:RKK>LH!;;^.VM()./! +MFYAEJXZ=A]R:WI`G28T.V4#@1F\$P'\_3-V>]=2#!'\?CY`\)V91'4O +MG-[RX/!FP1)HT?)L&70E*_X5DAB(@+MK,9>+"QX@IGW<5R`M]'_W#!2,4),P +MA1(8S[7!MV3[+*7)]U'X7HGR$?0ODJ\^IIBP8RGT<;]2.5IK+TD1]P2@TM(2 +M*[N=:]N?CS'P?__>\/?/""_$YGU:I-O[_;GD_L`##HQ'^JONM)(=OA8V.X/Z +M^&OY>@!_M?5_IHP46]Q]H%>:&SC.UDEL'O.K>!M6Q8<_7O]PU_QA'&F05UPCIQ%E-_Q%,]><\!JM]LY;JJQ>M;%)&) +M=R*?$40!O99O`.Q787>^@E__*'LA`M*2PALW@`RP^FX38I*Q.]\!G/Y,=IMGOW:PLL``!;[RM!Y>N`:?VJ[> +MOKN.00CJ*@'L`G%>#HAQ0RNKPK)ROM#V.=ACQ_E3EONGQPAW8CKPSV9GR;"3I@FJ\J0<8(?)H#U!O(L3 +M$<"_]^3@]C..5CQ!F*_8SBU(7HRH```@`$E$052-"$&L1J!&$<$PS'L^,X;< +M6K<#C'%](85R%7QEG7;L\O8'6,[E;L^U\5[&UY;UU[1ESRU=J_G-G1VYC$VY +M[W`^WQQ080D6,=]O2KS7;0-5KX^U#J&1!)&BYX.[:Z5$AOGQD]3!D0]21!ZE +MXP;#5,ML>T1^XKT->76[A02'LX0>D1)[KD7<3.VMGLCBCF2!=\M693.5!B\F +M%PC"S$BV6LEA2V48<'Y%@DY#T`Y!)/MJ"3>T@>WERX@KF#;S1MXLZUNN]<55 +MQPY<7>M?K?K\6!E;^5C'2):S/0YBI:(OL_@\/0HKV!C;%$/GD5HE-CTHF[?N +MA%OSO6!#PNQ7"V)DWZ%HKS#Q*%IK%1CEY?=MX&-^X>_/.#&K1I:P`^N1D@R[ +M/^,`/SB`,00?8^#S,='5'P,R.9#.*C,G6+1Z`,:S07MOZ]^7V3W+UX>D)L%X +MMAQS+#[!8O%\TGN]#K/@9UH[\83^OE7=7[9(U_NN/.Z^E5W$B(J0]7%WWA$# +MN01!WG'^6>MV@"%/LLF1)D".H0*";AYWKLV<7_J>8%NG[<&M@\#M!4*RJGHK +MOY9;"ZC.EL>CVLVER5Q^-X;@OW]O^/,S3F1-N+^_"%-FF=?P`O,:DNXS/8.! +M\TK!\:#W*?F;:Y3?7E?W6K3T7./%F/0^OMGR(%=S*F08OLDX-U$8B1" +MP/N]#=&RKOLS`E%0G`^S=0 +M$C?;X'1!(5.8NBH%L$I<:*XJ<+F_&2+X]_N&U_B"G]4E>7`E*1SE8)Y$;2KY78L**S+_6;S(1:(4 +MM-O[__?S@?_>OV`**WQ.Q0)S0/C[,P8LKLMM`'_T3RN0MP'_%@";M+9;66IR@#X&P&L(@;BK6[_.I:^I=Y"07*F* +M#7?/AJ.@D>LR6?^,%74U4%A;;&0<8A"TKEUL8%8!F97DV9*4DXL[6FJL(OQM +MHCYR[C/&`/RC#_R\!A@7ZSOR%-:S?%Z75NB>CH$%YF=\P>OU@M]$RLBCR(=: +M'_`U-S*U1$1'[*]2XU/)CH>W>0 +M-ODXHK9O*?;/K6ZV1;/,H**Z4^>W=#V5]EEB6&37QQ`>292(4SJFU-\6!^M5 +M()MHY]FW9QVFYFVL'3([Q2$/1%$T[C'K>$Z9("@E*?)]\+EGAI#,*='.&@"; +MLYBG(_ZOJ^*\WWVX%787-6ZK>56YT:A@>2H=K#G6TVL1GETKY9.I8N/ +M^PHK>KG`2^2!,,=(F@;W,7#JDSR!]R^M0;)N6WT"IO7TS_J.^Q;[''B.!=W& +MQL#M/P9!MK5*A):=`.Y``5V;0>8**_./F&>L3?5US_@23#G9C2'X^_."<1B: +M]^W/SPCOCYD(FYCWOX8I(Y^LE=EB&W\(:B1\8> +M[J;TMD8%S#N$7E57:995)@:R)41!*<#*U1UC#O4SO[CU43S(=$YJON5>SS.2 +M2L"RE"$U-5Y9$BJ6X9495SW[N@P!JM6]2;LP`M9:]64**US]@'E-UO?60S2^ +M!G@-N&:>L??IQQ#\&5_P@>\E=7JR=)L[QT,L\&XSR8!M-^V@J5#$//)QS6K#^8UKR>XU0=O].D8YMZ]KV=UW&-20:0E%?1/$?LX#P:9@(:+:^&_@97TR` +M:=Z"E+I>'A"G>FG._6ZV&)R/^<#/^`)(N-5!+/Y[ +MF(%DK4<4E\QQSN_<'J>H/(L%2L5<97KEJM_+2NW'"]3)AL-W6I:(\)3]W[%. +MXH'[X%EQ0W#G,*0NON'(O(;08SS%E6UU8R856*P!5J"]?H]HKA\M-YQAL_S# +MG!D&-Q*DZ1T?('1SN:_/VBDK+:(D!Y!;EFL$"'Q5B5S2I=1A[_K.#RMH=_S4 +M[;8CNG[VG$!C="U;T0HKOF>SVMH6?4(`,,&\2(5/33`-%W#$UW>L8K'.1R)= +M(%8>+:USJM<$RL@"_U!HE28'^/I`F#_GR&(QE;%V^+0=0J,I2O.`??+CK*:QB`"&8`/[GJF&$(P'O/'/NU +M`9ZEP?$]#E`)6=C5@')OA:<6&$KKW?:(_S[_))$P6(?Q98BO<+P23*#K33'! +MKK7F6*%M^$XQ+E5R^HI(T;@]NVYI4'<-:VKL?/3K-\*Z]P3S]@*V0M6!41:0 +M-8F6OH\-N-YQ#M?R;ZSML,X@"BN!NVQ`)0&7H36==_?@P6S*=MH:>O]-UG?GNQC*[/"EUC6VHY1 +M2Q_WU'PNON^<]9VIH.*=DPO-^!K6O.^("#_C"#`'S9X_SVT!=8O@/'61T7)N +M>=X9][VLO[L'KHNLW#L_8\E"3OIL,ZR>9%F3P_#;]KT5P3MO2R<\?X=#]I3 +M0+/7.PP1_)LMX#^O`88!HX)[3QN6>J=L.0!_?D;X]_L.P'N/>>XU=JW>I0!? +MR_[%"9KQ1+A?]MP,W/$,+U'/>LFXU/?\VQ/)N(M3+&2SI("<+"D;<`EYRS'/ +MQ@HKX=5;-/TD)<&P"(`3B$!U\'=I2DC**STQT-YR\ST%M%/A)GLR,,CWK]SG +ML=68]2"ZR=7Y,0;^>[_A]VVZ,>/__+P.]U=_DC*K14OLG-^O!3P/L#^S +M=]<_8W/G8HT\'7.@M1;@;9E,D-UA'*"UK??$`F7BTTPZ/V,$//ON*1F+.G=3 +MP`+G.%".CZ&0,(!Q[_'KCP74^8$G81P#HPCA7E>;=@HKP;J8A1X;DL#";>C3 +M@+6GVT>M1:2D[AHA$?B/@VS,)>_@IK`6".:^9_O-EOC_+_OD;0Q\".'G!?!Z +M#:(8`81Z2_//.,#O[R>I)K7.L-/*0M07B%$75Y\SQJ^U[S_G.UL2E]`BH#&U +M%E*Q2ZGY)D^H(,XW]MZ>YM\Y[41IK%5-&L345TI(LG(Q7WOVFKX8D81JZ,1D`EL6]U:3D,IJ0^/LD]*NG**F3;UG/U1^K +M,Y7VD:J4'A+YHTNF)&7UERY^W]VI9/.6",$J%DX4_@\HOQY+UG4^.,!.?G5E +M!$8BZ%YEO^KN:]U`AOU[?^#?;X)8";')"P=$^,E8WI]^^]-[3WQ+.1I8E013 +M[F&;1*G"WA$!`)&3L82;E/D2@B(+%@; +M:4H@HKC<3'_:I"^SH:^#/! +M!IY(\'06<^81/NXEY6,,T"_!9QA@'(9WO9YS91\;KQ-8/=WM%1%MP:NZ*)YL%!A@R)._Z +M*D9`!`P@)B8X%8@/6-V"4]$)%MV"7*WO`1_X&?JA8U;)R&6IB8+W"!E5[<') +M*4S5\DH!^Z4L$D>"EF[O0CY?\I'6BVKE=`;PYM?`:QA@M,B;;%>9O6,ZO@9` +MA*B/_6/VR$F9BJXF&U2&AD#E2?&E5TU9>L09L<<5ZZYG>>NVIUQG$'%RE9&P +M!]M;O]G-#UUK=SRQ$4_K(__[]BBSC)0&VRV>O88`_X^O95])X_GK4 +M\D2C1\MSJ!YXZCK5<[=GDH;E]]'>-,9F+`4^6\QDQ!XV$`L$9```AID(B0`\ +M\J1E*VP$""$IT`\0@[>(&Z#G%9N:,)$XX((1<690%]2OYE/L- +M!E0/:<&$^8P_G"6A5C.-U[M/V.82I>"Z>!*/,00[TW2[64%$I!),/_=8WUI? +MWZ5<):@BR#,U!MP58&E@*A(E\1_.DR.)IY`I"29891]#JP7^]4(89ENAE$R* +MLZBLNW1`^/OS@G_OSYK[_6B@U#+=62V94^W^:/&^JP!53A8O\L.QQBUKOA., +MC>WC(ZS*&,DZX(_!YFU32&3$CM00^9Y]#B,`Y.5XJCTE;97*#W^\;,Q5>C:; +M"UC.J2)=KC26#H5M+CVS:K`1MY\H@+\=2`6AVLI';H'QC\2!*65<9_8> +M9EHLM%TU;"Z+Z,2061>06Q6@>P)`(V%[N?Z=M3:W-K6L+[[?WY\/?`S":\#) +MU:5P+E-C^V<.0`@Q/MI@]IS-R!.X\*DZQI>7.">!C3)_TH+W4 +M*J_ZTV3>F`*OO$M,Y'D?SSO^Y!GR)I#XA?MI%_WVQGWO"=P@64JDM4KZX#// +M\FY%Q+;/=T'/^?S+0+L**VBY6GM-879)PB?G!1\SP/OS$>.PW%IJI53M54ZT'".OM#Q<[:@` +MK4\C5NK%NW'V^9PRP+A998!G$44(@U!=``L,>`660`C]+X"=\YT'Y7YF&Y8` +MB2*YU^W@V`CP3@%RF86=6(M[DHF5S?V>M[JSX%[/QDL(R*<"G)1UO01=]`;M +MD@PO)>V;?A<!9!T33&D-+]O^5S*GQT +M8>T"[+KFU4WS.^28EOIQ[#WN8QCD02%;J.2P`,QF@[$M[K[EW$GA2.'5#F=- +MMU-#^A9YHBE8%0F=X-8`\&=<9%(@F1=@H9ED85U+9^_9WI"Z(>#4`),AB>'> +M?;6RS`5B&!B$HJ:W#(@QV6`5;+!Q:QE#>[_WR+SQ*<5@[YKU&?&.ZJ\=W&7> +M'W@CSJDD!QB&,,V7J(TP,;D.KP$^'P,?0Z+;P)*^EHZ#9'ZD@6,**TX@(\,I +M>F-3NV=2^:+3S\3;*.U+R9Z/[9':X-A8@H4R*_1T&[>7L3;&1AN+C:JQE$M< +M2=AQ/7@_]L(H+9E5]\C54GF="BL"9UUE?/"((E(A!I3&+-9!HS$**^1*\IQS +M?S?S'G,M_A$BI\2[UBPRE>D?`XL([E^L6ZY\R690S;MFHYY%PG`6*&DAY((H +M?,#F[]BKT!P]KHL;#>(4S/H:)A!?W'>8ADADF!8L;:[5K< +M7:#IDC+)+>ZK2D$NT"7CN>U8;Q.#^.2_W/C%ZR\%USYC[=$:[-.%`P%5;]IO +M!NVYNEK30)_);%>]MN9@UL]G\H5_S5;XH:)=PX`P#*]5#G[(@/E0P/JL![`6 +M+=O^<]8C7FN?[+7@*U"_;AMR[J4E2MDHR::2`Z[D6@HK +M2*?OHX_*'!!OO$#:5#\DH#V6W<8-DJTG2Y(0+>U1"BNTM`E$W2M<,9+1Y0B@ +MO=<2%8X#!CES]QPZO0.%B^NM6`LK(^N:FQM6*_Q0[$^YL.F]@`98W00_QEB& +ME?L?A,H^JJ4]2+Y6!'#.K4;7_?,4#/^66C*_(Z'G4STS^A!,ON8X_VWQ3??= +MJ2FD7(H$LT[_VR1/-HQ=B9;(\J^R`DF!<`7BJP\IV/G5P:MGJ6#.N$WV>S8P +MCE8,:T@^-?^,&&6075S3UW<0K*XXCE\]6N,`TS.T`"0OOW@J&'AK4[V\28+^ +M1D(LI#!*6Q?B@7'C@3 +MB)0`HMCAX2[6Z>NX#B_90Q4)D7&^X_BP;L]/@'3)8Q5?\)+L-GS6%;-^=VG/ +MY$C'Q*D(@/HTC^7;<@'7QDR,K`.B8XE?5RM*#H$%Q$^YY=>ZE[@?QJVFZ4&$ +M=4&5=H:LV/=C?MY:*L^!`BZ*/;[T)65`=&[^D4)."8DOO3R=LB>CPA"[Y`CB +M?`C$7X=5BB>K['/[UG/A+54&[J@4VS[X&$$)>#7_VB\ +M-(\KX%W/[F'".IYVNOB*VZ#=P,):&@]N<,`V6%E=:%B1MPW^"6S+^39-J]O+ +M^I\;A#KU:["RQJ#EKF+6R5AJ7,$Y<$RD?&"KH[RLXV@I"QP`FYE>;7#O"U&* +M;"#'@\C'MT(A5B30&ELE2;Q@_3SUK3=,V28D2+"NE0`5E(/*0.NM!%I^?G/$ +MDEZGLR>AI5D'M\^4:RP);0-%P+P$O*_MI]+QH$!NQ9-5U+6Q`'DV&9/F;>L(VNV1Q2/DS5GR +M:>9`\>=B3&UDW\IK("0WBFTNSA?=/SBX;#:4"-Q,!:Q")`>[)#,+]UP,T/I` +M.OPLSK9KZZI"_<9U=9,UJT7&F?/&%/G)7WO>5XCB$01SZHT@/M +M/HA?#*.V3V7,[SO7<"+.#YQW4]F`.F9].24YVE.?L4`ZH6!$ZP-=#I.5. +MNK<@D?B]7\XJ628<`%W;;R3SO&%C, +MZF)C5AG;D\M`99T6+<\"O3T)GXX&[%?(Z3[Z[)X2(&F`(U,BT=74DO&`LU3' +M+.Z^;SM;/YM5)@RRBP7-`LI31*9`/F=1#[^'HF#;H.XN;B-?5&XP?*E\RE<` +MPU>T;)S];NFRZF'!V@PE$9]\W`"]DYS3=IMWW)PPT$I>L[L.P`!$,`>]AC>. +M+2U3"BO>M6BYGOR^Z[X\ZQ:VUSG$Y''G4CU:AX0'VL%.@8AANDACC&>!W^HT +MQEA*@^O4QJ5^=(`Y>.D@B2,:P3&*9OWJ0">6O21A4%%H2B4%3%(`9C`;AE!+32+Y7LW']-5P?#MA'W^^B +M?JM=X=]Z@/9>5JV:MDK:<+9\[:GDV#*!RS7>VJ^ZU("1R\01(ZF*M=&I&UJM +MESSI5,N])"7!DI26W!"M@E^QP=XM'2-)+`>W3B5C/0S#6K^3?3&1VQ\1/1_W +M%`"$.1C4BQ&S+>XQ\`$VR$;^F2`(,P"]F`9F%)[I7#[U%$@JR=W.'86QU(M< +M%'OIXNTE(*\&WH-^L()6N,.IT-*Y[\<08,>4BYHL.P!J +MU64!/W$23A`)KT7+26='2J,OJ`D_?) +M=J]%HR`VXA.>`L(\.(T#[6A0JZ?=VJXR_GMS?NUB-M0"P.^T5Z!4L.^%[V%, +M.TJ(Q:[I2ZRI$NM0#V'18QQ\B_05A'HO,J>.SOH)0!XZY5+!29A#L3;8A7/#8!16;"1T6@>SEBHA4UL_ +MS+,\*VRR;BH+2,T]-WC:+:Y[S#X\33#NH65^^A\]'WE$USKA'\C2(.0:GT>I +MGZST&>K)?MKU@$;+:+-3\T$I:PZQ^K\;6S-4R;ZKI;&T;Z9LXX*I(-Z)KRF3 +MD.P#I>B'O\A,`I.9X7)M&KD4\133$-="Q=ML`/YC,S8>6-BI14?T$:;(DW]5G!IJ56V[L5NHPL +M4C>=<\=;MV[]^+7BJ-B[_EL:$5HG:GAB;-`**]P_G(_[K!C$@C"3;B04YE*/ +M`5Y?*4@%84I`>@QL\^\`(4`O>S__'?D$1IEAOT@XU6CYWPC:>UGGCQ1\5R"S +MD+Y/E:]G*%&M`9"6\C6B"BO3-<:O17V]S^>]H/WL3#!=")@"L&GE65\RQ9`` +MW'*YU3?0C]'OQ_SG[>!4']3&L[PPUTFQMF.H<$3[)0HK:L5L,*H$M&MYUKA< +M-1`O+TSPT''A9($J7]^GC"J`?#;H=-U8=$SVC5_M`&X\*#W6?RV0EQB22CEU +MSI1S/67D$%BF?9#L_1X'5L1[I`3?I0#L^Z`\EIG&_5O8!M92OR@?7JK)V+M2 +M"RUFW<]/$"5^ZT<.H@>W@IN>[6K:OPHK8J6CE(Y>%AO=0^MUF7I +M/I&^YNJW0__+HJNORT0:0%D +M?G`/[5H'+85O*F#L^4IYJ\!:3!I4TNNO/7BO#0)L\=XC>2]\/W6B_)G0JXTI +M)FPIF^K>51:X3Y`F<4B1&/G@/E`[?\D^05$YR2DSZV?V; +M2Z]T]PN&*_BU]@2#5YR+;\U9WD+Y^_9\[UJTZ)EVWME_U=BRN\1>Y0Q8OJ&+ +M2)XN<@P`,:)CN383JY)#KN1;IFDQJR,#9BV_]Q0(CX'Y&%LJ"^0Y/W,F.-6O +M/P7$7<7$_PQ9X!_6Y7U^,2N[@OO[MJ=7GUHD-3H#>&H6HHOO`=2\V%JTE.[9 +M2Z4:/1";'.W6V>-6-6>LLRWLTN$,@E/!R@QCEOR2&6OTEKDE/9FQK#(QT)Y; +M)'R@*[/(2<9DFE(F(`':P\^(?993`-+HB<^PH^5YUHRK@3#IB=29T?O>M[4L=:Q8:M`)C,0R.-:MRL)%V;$RI<[MA(W3R`;>9 +MVVD2_O&IH%H7Q/M^:7[0[33R9(/Z18MBTE"F4DC&%`:6T"3'D8?49;$V.%)/ +M`V3^.!\9`-4B`$E.CN+[MF-\.=C64&IHJ6"6YY*[W69)1;#G8E.`?=_\?+#3 +M5!>BW">R124(*+5^..4"QP?27Q +M,C8>%O%C<[`JWJQWS$QMW1)0VQ(@\Y^;Q`[#U0B;$GT<6>/RP6"?I0M7"85O +M0RMOBH5:K=7O?<=8?V5]O,F&VRX!DD_*1/8J70%[6O`LQ$]+<*R=RA)>!C;C&U:CK-NW+_0OF<.-N@@ +M`QU:S!UZ;'K91SB@:'<[['ZW&<8ZS+C2K)9MS<% +MP0]>C064IM)9DI!8JGKJ]6KK5@=J:^:V$WISS2,,O\^KN;???;LZZ9`QT'(- +M^8#XT'.I@^@[RITREAVK5L&Z@UO-%6\!(D=7<7:U8J4TP3Y+Q#\SQH"O\S<* +M*[.P^-EC/-?N.%$2NH"<@.;B`38``"``241!5&$T]>NU_=97"_OBWI,.*,V! +MZ1Z@/2"!T@/L,K(=$NG#GF$EN*>P_08`K_W03_S-DORF21-]/:<&Z?)L3P3S:XRJ8G<&%%Y1M&D]9P%R'E030[40L?' +MG"#OXY0-8A7UN1:T/W-S/*%P_H9^OO![`Q0%5]W6S@U)TG2-:K&'_ +M3`[X`+9%WJ5%3Z6(!`B97R4:;9JXB^T\<^NO[UZJ"Q+;%S1[W4,Z)V-M^59*RG.V"P,!=PZU4627NORS:B]I +M7VQ/D5\WY5SL&0PZT1UU>@L_D9$W)=[*`'SW@OPG_$@$0^QO;QPRHEK":W;F4 +M]"<`3FIIO+05`QM:>"JQX>W'F!N_(YA5M3S'RJ9%Y[ZE'&K9-UWG96=EZ9FP +M=^[&%,CV+>,QIM%-)90QKJ;`,7L[9KV:/18[NJ#EP35V(1 +M;77++>E;R]NXGO*J65U>7$C)^>'_'$L1'/-Q]P-4'>`N`K"LGSMFP3G_+[)^ +M\0&1T_JLIQQXI$39H%)AYAC)YT1Y!>3.H)U;`T=>_QRK/S_3/A#<]&5RW!YR +M$%THV4WK?.UHY9=6B[MP,9!DFUY/AB@ISH7E<6<9<^6Y;]T67=?EQI32(-7X +M>IHY3;S?`^#N9PFU_<(7?W0#M$;V3>XL*U6*]?N2J]$E>YD@OTN>L.52=\F4 +MR`;WN`2CDN-OOO[$*AK3$X9)!YE7*#P`!'[>]5/"S%S3S++4X=+H"++--DAY<@V#,4$/Y116@B.3TB?]ZMO0;KU->7BEY97 +MG)^L7*$8!*BE1P9QFKQXV\IOJY'Y-M*UUPE5K.W8F&W,FA3Y>YLS^]IG."6Q +M$%8H_AB=GWJ@7CKVMA%HVV(4]AL)QL65A*Q>AT1+.*=A9()9:`/S*X"?+>63 +ME1ZM//``!E<.UOG[+F#?0#OPV6S`^I +M:T>?#71C#N450.2$6`HK]T/;;"FQ@"9T6%&!$;+I@]]=NR9ZH)4H3D>G$),< +MA&5MDNR)*QZ\SR%TJ@U^W+6NF#90T3=E1$FYFS@$9(-=8^,23]!`%O`,;ZT1 +M-Z;G)3\%SG\WF7>5!LBFY'?NYC(I5P(Y[G,^QGS%'7]S@JB;2(SL**J9!]_U<[EO +MT>D2/_DP\%66USWPY4\LXEB*1[U.>I:%:X]5]*S48258;:^/=:W_->K:N\Q[ +MM&C1\N2S,I2XFK>]O+[:\[TFIBUFU$G=@HB`N^,6$]%$?7#K![5N/NSD6?29 +M>H1@.^8N$]8I!_,VU&`)H)C^/V5C?+-O6\OPYT#6C1 +M2+L#4S-/>M[<-A8;$O9ZOY]%`5M$D8SKKC/6X`7W=2* +M!BV_=H=M%=<1E*9;E/B(Y_S9G3HJW_T-0.**F5E:!^)PF_<.`(;/.4N[^E>2 +M/_VJZ^7.^T['3XL6+5K..4=K#5:UH-T&X[%S8+E%L9\98Z`VY0(3(S\B,G/2 +M`-H`.C!6=SM;#86>-+GWK0\&"BN$W#\Y#?A#BWOK`S:;#:T*VY3TM*C["&^.5))*XE%RM6S=&'O#2UO9=PO@V*^[OY8U,9J2=H1 +M2QW*CEE%,';)V$NQ0BN_[:[&*0B-4T>3,EFNZUSF"A_?IR>=K;(3IPF?;$>]LJ:#5GM.+\ +MVIUU!"%X'T/&T@@!$T'V.1N`&RM9U$:L-.=D7^JQ?-S=H%,4*`HKE-3-Y3G; +MRP&[@G8%3W>>_Y;LG%=31E1QU**E/RC5<@U%)W2#:2=;[C+7>V]SI6"\EY7= +M#XP-,LG`E$+4\7'/!7VN*1N]=)#^1K:GV"!$K>;.P@`WAZG-%)7S^>3J7*-O +M,0^\]Y1DVU1NG2(LCA(\3P)/"BL$GSY/*$L2G9=XUV6YT7(H"+6O[K5<`[QK +MJ92G@C@L26R4%,"7Q"0XN=UG7.FF@S1H@5X_*-,B0D*+7`@GHB-8:55F*SO& +M[?3?1]<M4^T218$[*YD1C#9`8SES0IWK>&0:>&'#=-EV!I +M/LM%VSG$E1RFD\S7D-K_%D`/UC'@ZJFRO&7D!CUD*\TO9"[0E/=%#\YW9C#" +M\`G6?2<#?,4$3N*#,"]@U(:IY2CE@@4?I)8?+5JT:&DMCWW`'K/(:MEWKK5^ +M3TRA$AEB&$5\#U%CJDTQLB6NC!)F46"#/5&4[USB0Q^`=S_@M(@Y-0W>]_BI +M\X!?RYD;M*@-%CG77?J\-_BEI%UZ^#QK_6O1>=;2?JY+`-85U^B>YM:>1WMN +M$7H!^!RP+^F[Z`R.C$$**[3'UM>8`MKKWS`/B(%HO?))UN4SK++OEP'PF,4] +M]K713CTSN@%#G +MDYZ:UUK0+G'7].OG8DA9X)[UP\Y8*IVL,5G`R_E]!$L:6MI;G==R[F1U])B;YUE#>QQ +M)ERME,<$72-[K,1UH=2](?HN8@;A2_9>;_FX)W]Z[N=#SW9O/XU)=E(/(J8L +MYYP[#>8R_,[8L25M>] +MAY*Z6K0%A5<E,S;TX>:0.#8 +M]W+SDOI.<=L!`YD:([CV+QH0994*B@*X$3!PP=O[&6M/!!>G,<]S/Q+BEQ++02)Z+OD>% +M[#/*S>>Q103ZD8#=5KRP83MV*Q("*WU+,'!6H+$6+=^@;'W+^2P)-!1]OZ'H +M($:ZWT4VB6]#:>?W0>[C+JTG-;\I'_<@KSOBYN->FF\\<(F)`'P?Z$_^ZW%< +M%LLFP[8/4=QN+7?!Z=3-/G"V<))M(*XO[)=8) +M"7(L(X'>:=V;[5'G#A6\6W(;PR]M``EQYJQI,UY,LFVXJA4^=>M5S`%28&5/ +M6>=%,6*%[+(4ASL +M=N.RN6C?XHP#J8E@88OI36O.K05CR4'9B*^Q*9#:1VR!386.^PR*!P/],;;\ +M%1'J4T/6^YW7IU2MN7KTKTIK%:&2<:BYKMVG??4/@'\**U`_4NG:*UMS:[:V +M3M'WYJA/*EZ,Z*XY0@!!7)5-!&23.]I2;&J[8?I`3AU$,F(VR1Q1Y=E6.O>E +M,5'DOIB]:49*(W`2'KQV'&%\9%KN(R%C*.6_NXI'Q.!Y;`2D4W6B'4OFU$7. +MY\NYC%'#FH\S:>8I)!@V$_@6U[!BT.EOH[4TURL4FYMSX3&EE=G4`J]@$S3- +MSZS6=9R!N?5"L/W9T;JR"?.C$S`I(RN.+0HK`+G-A&6WP0^>\7<'NL#=1_F' +MG*EDR6!B!6'3MYV0;<&Q3O08P8/ZU!ID8.2[V-E2DF\C-9OO7B`,$<$84P7F +M)7[OV&&/:WF6PG&%W-\5:H'5UM9R)KR)FV3S#B7F(>N%Y+/C6.'E2=.D-W;# +M90<#&\Y]]ES@U-D@^4(**WWF:J45TVTA83;"QF#.1TZ+C.5,YWS0'5<9+__Z +M"BO^.3968<88J7][BCR*RPO?"BO0Z-5L/[!XU['MK1A97?=])?M$KE:.N3RU: +MM!RQA[_O7,='S%LI8$^=5[ETH2T5!O_G6)K*+37S3*VXNF>3>Q<2!\$4#TKU +M,L^X`#P.>*5^?J7YV$O?IP?W]3;D$\:U?3^PJNZC@+6"=BU:M&C14!1Q*"3]:*4JUW[M:^CYIY'F*?MIYCN)K +M5R*H_._EA(J$Y(?N1_MR;[4TC>!TD95YK;O70/UI)6I?[.C8TT(+7EF1J3IU??@R%)7_X^ +MN59&Q["2Q)(N96&5K.'JQ!C@)NI``-=5)@HK3E$BD#@BI3@X3X'F=;<+Z\AW +M^[H'@;K?:+GB.KP**_6X%BU7`AM'[D=:+\G;GAEW.W=XW]]SS^>K*J2R=DDR +MF6G*V2L9*7P%=\P":-C21,9\W.UG?"V?)"`=TE;O?:XOU\U1>L?%>`6!K]9, +M+7<$>7=>M[KGY&.RY]:P&[,H6GZR<-_X(35T'3;B"BO<00X=:Y,S^#PDOA?' +MXN,.Y,J'40:8*0FVM[^A%]2*V>^P2@"D@UV?8G&_ZV'54W@J0+@**_#4,="B +M)0;*I:Z$5Y6O=\[8=96VWSE#C9;V^&,/1TPL,-7.*K-^C@#C\EKN8H:S0+-LLTK:0!5CJ266TJ-`4K!@90$Y=%GD&D1;^^$X= +MK,&E77[]M+^\_W)5YK2H<62/G`MVU.D`N,1WWCV7>[GQ^6-R1W!EX@P;BPHMI5!$1#P;MP +M2D@S,SU-_R(8RS\]Q:C)IG5$B\A)")XYJWVX6/,!!?SO*`;KK;/8K%H7Y(-8 +MC'3!"Z_N2UCA2JA_FXO]6PA5$J3XCNR3+?/3NC_\L<7$6)=&NOMC2[,;I$L3 +M86#PV>":"53R)(]/4($BI:,T-R^7EFM/@%$L""V5O_>N%B8M]3))ROR;HT*/ +MK:,:LL(]_0ZY#5S!-3%^$TRD/J6&,! +M2-DQ7-ZWL-L.,X_J9BJ?YGB4$B(%+BV)O;!;:U7W*AVJ&UK)=%TI*-2BY1MD +MW1G!HE#S[X +MO3+'>/M-J`!+BY:S!+2"1RU:GKV_OVF/?UM_]XS1^C]@US/A:>O1S5"#5K^V +M9\96&F3,2BZMWWDNXWHC94U=_(2XE)17T)RS!$@@)6N0D5&T\E^_DA6BUY5M +MKBXIB4EU\$Z&[*'[E2.7/[I@3KBUT8NXJ-0G/35GM;$!->WNXN.JY3#0FO.% +MOD-?:N*S)&=2+M%$Z[,%YX"MR(^ +M%,GR@ABT/>=7RA>^1G8,I8"A&HQ#%)>7DS.53.2)&V;OH>T#"1:$?/'!WFL^ +MSQZG7F^7`-Q5>%H-V;Z'MQK3FIRZ3P"46IXS#]+Z[C#_L4Q@1QI<=&U^A^.P +M%+0+H/CN==7B_/3+Z`.@E-O,]#,PSZ)(TTWG@(=SM<*[@E<=`BUWTAZT*$#1 +MHN7+]ZZFD$[+M+-N\\,VT*'O#`F8`.P4Z\O?QYC;2=K'G4N/A&+0#A$@KXM9 +MBP*@"VF$.C1:M&C1(CH[6J8#U7']CO?'4HJNK*DTDS!9&640,0Q.38'N7,K( +MV/=]<$Z0SL&N9F0M6BX@0'4?:M&B14LWL*:&HQ-!,UUC;NQ`WM2[[6?&Y0\Q +MHH#5%6:.,"``()R(%%9V)Y2#>D($XX2N()CUM\6I5E9?$OP+%8KMMF#YG[K1 +MO9=JUSASTA#7[F6HR*?)&AB]9R/9@@0A4VP!4\&S2S%AL&5F0)8GW=/Z],!,U`G/6QN5.SX!?1(1!4)^,<,\P\T69QCP%B`(])E>2,IORF\.N\FD_[O8*!"*NER;&:\\G! +MB>W31#6LB^K>UA-\HJBG"BLD=1BT:-%]<=:YIJ71&1<;4^P_EZO9&#?SG)L2 +MD@(8)?1QQR)7&JF&JOY=SQ2-14_OS%%_."R@ZV^*LP"FF[,5CYR50\#W%<;XCDI+\W'2 +M0U3+@Y3JONVF1XZ9EF?N4P0\]7V%3 +M[CHD2!U90MQ4"BNXS]9L%Q:Z*(OJ[`)E!QB1=)$4LJGV5[+JB\FQB1+MAMM. +M_9EN&C,%E<2":W)KKB:Z/19@ON>`+`HK]BE0)/8>T"T95ENTL_45M@*89X&" +M/4S4J>01_MK;R_29"BN\I*72]_27B^U2=I<+$>B8RQ0PS8:UK)9\N*U/P.*:NXA)`I91%GZZ:X)5U+ +M-4[4<@$!-@EWG0,M6K0H>,\!S;L">`7O[10A+H>YEGQ:9S8X=0\K:M9M!>K= +M5K1HD2[T,P.K-(!(BQ8MG#SX=MEPUX!7+J/+5?K1JST2**TG7..YG$>=`ERS +M99H!F--!TC3K\[^PTJP2+&EHT,FW3F21^2S$.N02%VV+R,M#"6@U:O.5E[K1 +M]-HLQ"HBZ#;2V2S'Q:1-_NWN2+K$!P1+NL]EUMQM=_SVXGSNXJ1Y$Z^@?=W4 +M=BY)=$B9-L$0'W!^0V$R?VC*G:;EU0HK1?\GYW-)V[N`WV7946Q\YQ:NKAI; +MB[$#V"GIMP/@'1#W/(2R.^\M'@/G04Q[3<<'N?+N!/PFVQKM= +M_1:.NYOU2$'[-X'XDH#_[GM_7GN($%)ATH(+;+G]@BD\;@"7=5P**RCKV%FY +MIA.1N"IQX"?;*X^U'`66;DRW(387;8[&^D#//"ZJY]=UW6(\]VQ,K1\4K;75 +M`+2^PE+JYO^'`">E>QC*[?09X)NJ$-,,K8#^9[@2,FWO=]NUNLK$76+RFDE) +MD"I5;B8M:8U0RS&'KOKB:3E2\=6BY=EG%S:JB;JD[FNUU_7L.$[N+3>U^,#Q +M6];1Z%]CE>!HJ6^[`^BM*R(%[0HK8.X&VNU;$"U:%+!KT:)%"BNZKB!W3G$C +M]8)H%?O)E3WNW\$%UN6@74;@5)9"4HN6JX)W6\G5HF6/<%8@K^7+=T%#X8RW +MV//7:(>.P9T`//?OZ`)HCB!`1L#`34SM\Z7YX).*!9030\1\48]6,MA43^B/ +MA1!L5A+Q["7TN/.&L<>@%YD0"BNO]"17K3V85-$.MNDTW[%V9OU!"^IK2=A4 +M4^\5K%Y:KBEG]KI1Q.HI7V/H)%U89'Q(:L.#03OK18Y$RLV6P=_6ITB%?#S@ +M*\(Y&9"BD^\)1&-C*JF7ZW.MPN1_M2>9$S?N+0@`:\Z[U!I)_9XC[^-.\=IW +MV>LDAK.&W(%9D_*Q=`-M6"_O^L>-&<"C=3#G+=Y1X20^S@R<7`F(M6K1HJ97($LLY#V3OJ0Q=1?:7C+N6X]>'[RXSIH#W_!<6=*<8 +M5SF`KZ#]Z(EW!:..?LL[HM*E:[SCF/"[>)%Z`Z9,$.[2.0Z+T(6M:.#0;Z.%L%[FK]X2U^ +MFC!`:K8Y:YX_8LU=14U0=46+EB<:"&RWF)*V'&<=QHCH1SI^C._H*G-:)IU# +M7]N79PB9^L;-6X:L#32L@[Z0)#H6]%@#R:>@F3+/&PB9&&,_EV2;,2F_^\SB +M"TVMO';]B?5(A,S[O;,$AX@Q +MS[8#FD"X\>>@@>W((%8^(!HFJ-&O'Z$TD89T?@8&3Y"G;92>\9S\SGW_2!"< +MDE6E[?`98VO?72(_!X@3?Y4%H?K`SS#U)L[0@H02,=E`\SF\6-\GYM3`#[UL +M?S]>^M&C1LMN(H$4'2XL65;XB_NFJF%_/L'),!]MG(K+7&*<,C!RH +M#L"V(&N,_YRM/:N/NQ8M=Q-&BD?W"BM>+5JT/&O/EZ9Q+,$]9Z6=5J!^SKB4 +MICBV/3O&V$+98W&W?@.Z>T2@%BU:=A9J](P6+5JTG`N^6@-KSE5*#9W?!>)C +MG\585(O-%F^KJV +M[%BO?-N)_1^Q'+2W),-2ZY"6NQWFTF=JUW8+`IZZK^(EQOHN[S^K#[EUNB=U +M:GY@+?JK'``IR9Q:>BZD\(#C*N,WU`>[!/FL +M+PNPC06FED.LYUP5Y02P%CVL%0!JT:*EMYRYHPL&I\S<5;:K"\P!8WYS#,#A +M`=]59A1I30GWE#W^\=\!V^\M.'G-O_9[*K3V6@ZT:-&BI04(UO-3^_#$TC*L +M$CNK`3G`;BNL]K\#!\H"OW_:;BV*&>K.?VZOVO^.--,+;![&B,*`.^9[%`C$ +MQ0UJ(]UPB;@0#'V2!T<_T9[>A")W)<(`2")#:B5J%RW4(!B5"+6!-=6!/+GQ +M\@B%MOI\(I;\R#N4Z7Z?J4Q($A$,A>!#XD=:$I2MP$'+64K]+F,8L>R!VYY# +MG&C5!>\FAS3)EP&8W-<(O```&SDE$051NE2]HG6V4/?>FWZ=3 +MCG\WPF:'E>_MN"\^,F23^^VWXYT%XM<)I!N2<(]7:`OZ4N +MNB>R_$QPW_R=U.:ZK674?"[(&D5S7I(A2L&N%BU[]WQW.=JD?I28!H1R@1HU +MG2K036:\;YP5YFK@O?TYCX5K-0::KSNFHS1SB\^(FHKH5A^NZUMMOM5R>-_K +MXN<)6"U:M&CI?=8]M6^V`4YE]SW/PI);='L]!^D@?>!=DJJ1L[!K.4"_]+TP +M*'U->59.^2NMB:\6=(A9J_MTA=WJA2H+M&@IWS9/WS=]B8RN<(:T;`L'U)^L +MI.Q95;AK3H_'!CG7&=]8/J0FO80PB0X"9[I`]R^,;]?.O[[_DK'1;:9%BY;3 +M)%$[^?XD>;\GW[FNJK8XH=68E\9JL>D@N0"-5)"&A-4T%W`:?$XT604CUT+I +MNC'03+D@D!X**X"$/$,2"+<[G29B=@Y:$$`MX]U;F<)V$U1:SBL(SK +M,`S)S[F@IE1L02H?,C5G3%UFL"W!46WL1(\#3@]-+5W6%&URIY1\)W<&2M:R +ME'"1.P/LO^?:&3M#I.V>G@D)G_;L2REIU%X9FB/(DF;JR]VRM\`5M?*PA/11 +M$IA9JJSM91`NJ4_"-1"[+9$0-BV?#4'JQX(@TM[^[&I=5S!Q??O.]>99YUZ+ +M%BW?=-;=6>1I%JMO6)]M@YE'#B1+P#MKT6VTR&P?)07O^R?[*F-XM$]@C39\ +M5X&OKE!:M#S/TH`"J_6WGFM/&H_4S?LWS_V=SK)4[O4]?>1B&\9<\*D$O/=8 +M4*W(G)HM&(3;!`MQ%+FD3LN/!+1/]N?4HD6+LFU^Z]CHO-_S'.9`>\XE*G=V +M^\K;$`/+4J`0R]?>`G03]8&;I2X^=/.%).\0"BO^#RO;7C6O!KR/A5\V^Y3X +M/?'^SL*;\_D6W6J(>T'>_S$A$UJ$@C6Q:Z>YZZ]D7EMG=="BY4Q95K(&2V_A +M=GB$AS*#S`Y#5UY"28EN:M^9&V^$NM.RE\SY)MG4;LPI_;>Y0@FA8:_YPCDK +MO?__*`+K]M*FC56*$,!8+C*EC*BQ0S:@2_`8WO8>QC6!)M1A(W+!#RVN1;EZ +MT?CS$>L0%BYX6H':]EX"Q)>C(-4LZ!:@RT^E)/N2OXXI$J1:'@U>,H>2%%%5 +M8V;O)U_PT-)+8MAC0]&XL!2[S',VTZRT[[3N,;=?]CLQ.%ASEHF>P%R!O):C +MP?N>($Y.TE<%$?^'@6Q%(-L0:C@*,`K<.\% +M>+5G.#K\7`?,4^*6<@R6DAV$/9-#<-6-HAR;)P>*:FFKA>/J*D&W:KN6*\_- +MSK6$=NYJ#)$PHKL'CSY,DGPC&7MKND+&W9`!%U7;0Y +M\@^)0&O)3%:;"BMR^@HK'KZ92])(U0:LE3Q?'J-0Z#M+FVW#7S,2:T8[0K'X +MYZI`:KD:,)3*/([$T#]S8D"J53K*7!WQLV*3P=+WU_H4N^^@%?9L"LE=OD46NWOLW8H([2PQ$2LG\"\!QX/VN, +M8D1\+-O\P29W9,#O$3)XSWL0,9D=;\^Y:RL,N>Q(L2:,H"5K';^WO/ +M:=-`DV?'>>AR5]"NY0HKFY!T#0O'JCI+3@+PQNO!YF.?>R=W`U(SCPM`5P=,YSYO9-1*@7ON)/Y*X%ZJ+1UA%3[:%TY+?BVD7944K&F![$&J1K19W +MZ892^^/]ST&%VV6800>K"+QKT7)GD/N4@/`6_OAGC4F.<"\7.R:IZ^PI[C&F +MK=-);JXRX4'(OJN`O+3\MB2TNO]_KBB7*4\DD_0`````245.1*Y"8((*7"!. +9;R!N97=L:6YE(&%T(&5N9"!O9B!F:6QE"@`` +` +end --- kdebase-3.5.6.orig/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/knetattach/knetattach.desktop 2005-03-17 02:33:16.506855480 +0000 ++++ kdebase/knetattach/knetattach.desktop 2005-03-17 02:33:22.186991968 +0000 +@@ -45,3 +45,4 @@ + X-KDE-StartupNotify=true + Categories=Qt;KDE;Network; + DocPath=knetattach/index.html ++OnlyShowIn=Old; --- kdebase-3.5.6.orig/debian/patches/kubuntu_90_execute_feedback.diff +++ kdebase-3.5.6/debian/patches/kubuntu_90_execute_feedback.diff @@ -0,0 +1,96 @@ +diff -r -u -p kdebase-3.5.6.original/kicker/libkicker/panelbutton.cpp kdebase-3.5.6.patched/kicker/libkicker/panelbutton.cpp +--- kdebase-3.5.6.original/kicker/libkicker/panelbutton.cpp 2006-07-22 10:15:18.000000000 +0200 ++++ kdebase-3.5.6.patched/kicker/libkicker/panelbutton.cpp 2007-02-09 21:43:06.000000000 +0100 +@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE + #include + #include + #include ++#include + + #include + #include +@@ -39,6 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE + #include + #include + #include ++#include + #include + #include + #include +@@ -487,6 +489,9 @@ void PanelButton::mouseReleaseEvent(QMou + if (e->button() == LeftButton) + { + m_isLeftMouseButtonDown = false; ++ ++ QPixmap pix = labelIcon(); ++ KIconEffect::visualActivate(this, this->geometry(), &pix); + } + QButton::mouseReleaseEvent(e); + } +diff -r -u -p kdebase-3.5.6.original/konqueror/listview/konq_listviewwidget.cc kdebase-3.5.6.patched/konqueror/listview/konq_listviewwidget.cc +--- kdebase-3.5.6.original/konqueror/listview/konq_listviewwidget.cc 2007-02-09 23:58:09.000000000 +0100 ++++ kdebase-3.5.6.patched/konqueror/listview/konq_listviewwidget.cc 2007-02-08 03:15:39.000000000 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -961,7 +962,42 @@ void KonqBaseListViewWidget::slotReturnP + url.cleanPath(); + bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(KGlobalSettings::trashPath()); + if ( !isIntoTrash || (isIntoTrash && fileItem->isDir()) ) +- m_pBrowserView->lmbClicked( fileItem ); ++ { ++ m_pBrowserView->lmbClicked( fileItem ); ++ ++ if (_item->pixmap(0) != 0) ++ { ++ // Rect of the QListViewItem's pixmap area. ++ QRect rect = _item->listView()->itemRect(_item); ++ ++ // calculate nesting depth ++ int nestingDepth = 0; ++ for (QListViewItem *currentItem = _item->parent(); ++ currentItem != 0; ++ currentItem = currentItem->parent()) ++ nestingDepth++; ++ ++ // no parent no indent ++ if (_item->parent() == 0) ++ nestingDepth = 0; ++ ++ // Root decoration means additional indent ++ if (_item->listView()->rootIsDecorated()) ++ nestingDepth++; ++ ++ // set recalculated rect ++ rect.setLeft(_item->listView()->itemMargin() + _item->listView()->treeStepSize() * nestingDepth); ++ rect.setWidth(_item->pixmap(0)->width()); ++ ++ // gather pixmap ++ QPixmap *pix = new QPixmap(*(_item->pixmap(0))); ++ ++ // call the icon effect ++ KIconEffect::visualActivate(viewport(), rect, pix); ++ ++ delete(pix); ++ } ++ } + else + KMessageBox::information( 0, i18n("You must take the file out of the trash before being able to use it.") ); + } +diff -r -u -p kdebase-3.5.6.original/libkonq/konq_iconviewwidget.cc kdebase-3.5.6.patched/libkonq/konq_iconviewwidget.cc +--- kdebase-3.5.6.original/libkonq/konq_iconviewwidget.cc 2006-01-19 18:02:19.000000000 +0100 ++++ kdebase-3.5.6.patched/libkonq/konq_iconviewwidget.cc 2007-02-08 03:15:39.000000000 +0100 +@@ -1848,7 +1848,7 @@ void KonqIconViewWidget::visualActivate( + // Adjust for scrolling (David) + rect.moveBy( -contentsX(), -contentsY() ); + +- KIconEffect::visualActivate(viewport(), rect); ++ KIconEffect::visualActivate(viewport(), rect, item->pixmap()); + } + + void KonqIconViewWidget::backgroundPixmapChange( const QPixmap & ) --- kdebase-3.5.6.orig/debian/patches/27_kfreebsd_sysguard.diff +++ kdebase-3.5.6/debian/patches/27_kfreebsd_sysguard.diff @@ -0,0 +1,30 @@ +--- kde/configure.in 2005-08-29 01:43:19.000000000 +0200 ++++ kde.patched/configure.in 2005-08-29 01:43:55.000000000 +0200 +@@ -1816,6 +1816,7 @@ + case "$host" in + *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; + *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; ++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;; + *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;; + *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;; + *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;; +--- kde/configure 2005-08-29 01:42:54.000000000 +0200 ++++ kde.patched/configure 2005-08-29 01:44:36.000000000 +0200 +@@ -52915,6 +52915,7 @@ + case "$host" in + *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; + *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; ++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;; + *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;; + *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;; + *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;; +--- kde/ksysguard/configure.in.in 2005-08-29 09:59:21.000000000 +0200 ++++ kde.patched/ksysguard/configure.in.in 2005-08-29 10:00:05.000000000 +0200 +@@ -3,6 +3,7 @@ + case "$host" in + *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; + *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; ++ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;; + *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;; + *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;; + *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;; --- kdebase-3.5.6.orig/debian/patches/kubuntu_74_sidebar_icons.diff +++ kdebase-3.5.6/debian/patches/kubuntu_74_sidebar_icons.diff @@ -0,0 +1,11 @@ +--- kdelibs/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp 2006-08-05 21:45:03.000000000 +0200 ++++ kdelibs/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp 2006-08-05 21:46:34.000000000 +0200 +@@ -105,7 +105,7 @@ + { + // The reason why we can't use KFileItem::iconName() is that it doesn't + // take custom icons in .directory files into account +- return m_fileItem->determineMimeType()->icon( m_fileItem->url(), m_fileItem->isLocalFile() ) == "folder"; ++ return m_fileItem->iconName() == "folder"; + } + + void KonqSidebarDirTreeItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment ) --- kdebase-3.5.6.orig/debian/patches/kubuntu_67_easy_zeroconf.diff +++ kdebase-3.5.6/debian/patches/kubuntu_67_easy_zeroconf.diff @@ -0,0 +1,304 @@ +--- kdebase/kcontrol/dnssd/kcmdnssd.h 2005-10-10 16:03:49.000000000 +0100 ++++ kdebase/kcontrol/dnssd/kcmdnssd.h 2006-07-19 22:23:36.000000000 +0100 +@@ -38,12 +38,14 @@ + virtual void load(); + private slots: + void wdchanged(); ++ void enableZeroconfChanged(bool); + private: + void loadMdnsd(); + bool saveMdnsd(); + QMap mdnsdLines; + bool m_wdchanged; + KSimpleConfig* domain; ++ bool m_enableZeroconfChanged; + }; + + #endif +--- kdebase/kcontrol/dnssd/kcmdnssd.cpp 2005-10-10 16:03:49.000000000 +0100 ++++ kdebase/kcontrol/dnssd/kcmdnssd.cpp 2006-07-19 23:04:27.000000000 +0100 +@@ -27,6 +27,10 @@ + #include + #include + #include ++#include ++#include ++#include ++#include + + #include + #include +@@ -35,6 +39,8 @@ + #include + #include + #include ++#include ++#include + + #include "kcmdnssd.h" + #include +@@ -65,7 +71,10 @@ + connect(hostedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged())); + connect(secretedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged())); + connect(domainedit,SIGNAL(textChanged(const QString&)),this,SLOT(wdchanged())); ++ connect(enableZeroconf,SIGNAL(toggled(bool)),this,SLOT(enableZeroconfChanged(bool))); ++ m_enableZeroconfChanged=false; + if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false); ++ kcfg_PublishType->hide(); //unused with Avahi + } + + KCMDnssd::~KCMDnssd() +@@ -75,18 +84,55 @@ + + void KCMDnssd::save() + { ++ setCursor(QCursor(Qt::BusyCursor)); + KCModule::save(); + if (geteuid()==0 && m_wdchanged) saveMdnsd(); + domain->setFileWriteMode(0644); // this should be readable for everyone + domain->writeEntry("PublishDomain",domainedit->text()); + domain->sync(); + KIPC::sendMessageAll((KIPC::Message)KIPCDomainsChanged); ++ if (m_enableZeroconfChanged) { ++ ++ QString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user."); ++ ++ KProcess *proc = new KProcess; ++ ++ *proc << "kdesu"; ++ ++ if (enableZeroconf->isChecked()) { ++ if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) { ++ ++ *proc << "/usr/share/avahi/enable_avahi 1"; ++ proc->start(KProcess::Block); ++ } else { ++ enableZeroconf->setChecked(false); ++ } ++ } else { ++ *proc << "/usr/share/avahi/enable_avahi 0"; ++ proc->start(KProcess::Block); ++ } ++ } ++ setCursor(QCursor(Qt::ArrowCursor)); + } + + void KCMDnssd::load() + { +- KCModule::load(); + if (geteuid()==0) loadMdnsd(); ++ enableZeroconf->setChecked(false); ++ QProcess avahiStatus(QString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); ++ avahiStatus.start(); ++ while (avahiStatus.isRunning()) { ++ kapp->processEvents(); ++ } ++ int exitStatus = avahiStatus.exitStatus(); ++ if (exitStatus == 0) { // disabled ++ enableZeroconf->setChecked(false); ++ } else if (exitStatus == 1) { // enabled ++ enableZeroconf->setChecked(true); ++ } else if (exitStatus == 2) { // custom setup ++ enableZeroconf->setEnabled(false); ++ } ++ KCModule::load(); + } + + // hack to work around not working isModified() for KPasswordEdit +@@ -97,6 +143,12 @@ + m_wdchanged=true; + } + ++void KCMDnssd::enableZeroconfChanged(bool) ++{ ++ changed(); ++ m_enableZeroconfChanged=true; ++} ++ + void KCMDnssd::loadMdnsd() + { + QFile f(MDNSD_CONF); +--- kdebase/kcontrol/dnssd/kcm_kdnssd.desktop 2006-05-23 12:33:30.000000000 +0100 ++++ kdebase/kcontrol/dnssd/kcm_kdnssd.desktop 2006-07-19 23:04:55.000000000 +0100 +@@ -125,6 +125,7 @@ + X-KDE-Library=kdnssd + X-KDE-ModuleType=Library + X-KDE-ParentApp=kcontrol +-X-KDE-SubstituteUID=false +-X-KDE-RootOnly=true ++#root parts unused with Avahi ++#X-KDE-SubstituteUID=false ++#X-KDE-RootOnly=true + Categories=Qt;KDE;X-KDE-settings-network; +--- kdebase/kcontrol/dnssd/configdialog.ui 2005-11-08 22:36:06.000000000 +0000 ++++ kdebase/kcontrol/dnssd/configdialog.ui 2006-07-19 22:45:35.000000000 +0100 +@@ -44,45 +44,17 @@ + + &General + +- ++ + + unnamed + +- +- +- kcfg_BrowseLocal +- +- +- Browse local networ&k +- +- +- Browse local network (domain .local) using multicast DNS. +- +- +- +- +- kcfg_DomainList +- +- +- +- 7 +- 7 +- 0 +- 0 +- +- +- +- Additional Domains +- +- +- List of Internet domains that will be browsed for services. Do not put .local here - it +-is configured with 'Browse local network' option above. +- +- +- ++ + + kcfg_PublishType + ++ ++ true ++ + + + 5 +@@ -96,50 +68,104 @@ + + + +- LANButtor ++ WANButton ++ ++ ++ true + + + + 11 +- 23 ++ 51 + 618 + 22 + + + +- Loc&al network ++ &Wide area network + +- +- false ++ ++ Alt+W + + +- Advertise services on local network (in domain .local) using multicast DNS. ++ Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode + + + + +- WANButton +- +- +- true ++ LANButtor + + + + 11 +- 51 ++ 23 + 618 + 22 + + + +- &Wide area network ++ Loc&al network ++ ++ ++ Alt+A ++ ++ ++ false + + +- Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode ++ Advertise services on local network (in domain .local) using multicast DNS. + + + +- ++ ++ ++ kcfg_BrowseLocal ++ ++ ++ Browse local networ&k ++ ++ ++ Alt+K ++ ++ ++ Browse local network (domain .local) using multicast DNS. ++ ++ ++ ++ ++ enableZeroconf ++ ++ ++ Enable &Zeroconf network browsing ++ ++ ++ Alt+Z ++ ++ ++ Browse local network (domain .local) using multicast DNS. ++ ++ ++ ++ ++ kcfg_DomainList ++ ++ ++ ++ 7 ++ 7 ++ 0 ++ 0 ++ ++ ++ ++ Additional Domains ++ ++ ++ List of Internet domains that will be browsed for services. Do not put .local here - it ++is configured with 'Browse local network' option above. ++ ++ ++ + + + --- kdebase-3.5.6.orig/debian/patches/kubuntu_84_konqueror_stop_reload_button.diff +++ kdebase-3.5.6/debian/patches/kubuntu_84_konqueror_stop_reload_button.diff @@ -0,0 +1,108 @@ +diff -ur kdebase-3.5.5/konqueror/konq_mainwindow.cc kdebase-3.5.5.new/konqueror/konq_mainwindow.cc +--- kdebase-3.5.5/konqueror/konq_mainwindow.cc 2006-10-01 12:32:03.000000000 -0500 ++++ kdebase-3.5.5.new/konqueror/konq_mainwindow.cc 2006-10-16 16:05:15.000000000 -0500 +@@ -1775,6 +1775,34 @@ + } + } + ++void KonqMainWindow::slotReloadStop() { ++ if (m_paReloadStop->icon() == "reload") { ++ slotReload(); ++ toggleReloadStopButton(true); ++ } else { ++ slotStop(); ++ toggleReloadStopButton(false); ++ } ++} ++ ++void KonqMainWindow::toggleReloadStopButton(bool isReload) { ++ //m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, SLOT( slotStop() ), actionCollection(), "stop" ); ++ if (isReload) { ++ m_paReloadStop->setIcon("stop"); ++ m_paReloadStop->setWhatsThis( i18n( "Stop loading the document

" ++ "All network transfers will be stopped and Konqueror will display the content " ++ "that has been received so far." ) ); ++ m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) ); ++ //m_paReloadStop = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( slotReloadStop() ), actionCollection(), "reload" ); ++ } else { ++ m_paReloadStop->setIcon("reload"); ++ m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document

" ++ "This may, for example, be needed to refresh webpages that have been " ++ "modified since they were loaded, in order to make the changes visible." ) ); ++ m_paReloadStop->setToolTip( i18n( "Reload the currently displayed document" ) ); ++ } ++} ++ + void KonqMainWindow::slotReloadPopup() + { + if (m_pWorkingTab) +@@ -3667,6 +3695,7 @@ + //kdDebug(1202) << "KonqMainWindow::startAnimation" << endl; + m_paAnimatedLogo->start(); + m_paStop->setEnabled( true ); ++ toggleReloadStopButton( true ); + } + + void KonqMainWindow::stopAnimation() +@@ -3674,6 +3703,7 @@ + //kdDebug(1202) << "KonqMainWindow::stopAnimation" << endl; + m_paAnimatedLogo->stop(); + m_paStop->setEnabled( false ); ++ toggleReloadStopButton( false ); + } + + void KonqMainWindow::setUpEnabled( const KURL &url ) +@@ -3836,6 +3866,8 @@ + reloadShortcut.append(KKey(CTRL + Key_R)); + m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new KAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); ++ ++ m_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, this, SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + + m_paUndo = KStdAction::undo( KonqUndoManager::self(), SLOT( undo() ), actionCollection(), "undo" ); + //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); +@@ -4070,6 +4102,7 @@ + { + m_paAnimatedLogo->stop(); + m_paStop->setEnabled( pendingAction ); //enable/disable based on any pending actions... ++ toggleReloadStopButton( pendingAction ); + } + + if ( m_currentView && m_currentView->url().isLocalFile() && +@@ -4371,6 +4404,7 @@ + updateViewActions(); // undo, lock, link and other view-dependent actions + + m_paStop->setEnabled( m_currentView && m_currentView->isLoading() ); ++ toggleReloadStopButton( m_currentView && m_currentView->isLoading() ); + + if (m_toggleViewGUIClient) + { +diff -ur kdebase-3.5.5/konqueror/konq_mainwindow.h kdebase-3.5.5.new/konqueror/konq_mainwindow.h +--- kdebase-3.5.5/konqueror/konq_mainwindow.h 2006-10-01 12:32:03.000000000 -0500 ++++ kdebase-3.5.5.new/konqueror/konq_mainwindow.h 2006-10-16 16:01:38.000000000 -0500 +@@ -313,6 +313,8 @@ + static bool isPreloaded() { return s_preloaded; } + static void setPreloadedWindow( KonqMainWindow* ); + static KonqMainWindow* preloadedWindow() { return s_preloadedWindow; } ++ ++ void toggleReloadStopButton(bool isStop); + + QString currentTitle() const; + QString currentURL() const; +@@ -372,6 +374,7 @@ + void slotLinkView(); + void slotReload( KonqView* view = 0L ); + void slotStop(); ++ void slotReloadStop(); + + // Go menu + void slotUp(); +@@ -646,6 +649,8 @@ + KAction *m_paStop; + KAction *m_paRename; + ++ KAction *m_paReloadStop; ++ + KAction *m_paTrash; + KAction *m_paDelete; + --- kdebase-3.5.6.orig/debian/patches/14_kdm_no_custom.diff +++ kdebase-3.5.6/debian/patches/14_kdm_no_custom.diff @@ -0,0 +1,18 @@ +--- kdebase.orig/kdm/kfrontend/kgreeter.cpp ++++ kdebase/kdm/kfrontend/kgreeter.cpp +@@ -324,7 +324,6 @@ + KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe ) + { + int prio = exe ? (!strcmp( exe, "default" ) ? 0 : +- !strcmp( exe, "custom" ) ? 1 : + !strcmp( exe, "failsafe" ) ? 3 : 2) : 2; + for (uint i = 0; i < sessionTypes.size(); i++) + if (sessionTypes[i].type == type) { +@@ -352,7 +351,6 @@ + } + } + putSession( "default", i18n("Default"), false, "default" ); +- putSession( "custom", i18n("Custom"), false, "custom" ); + putSession( "failsafe", i18n("Failsafe"), false, "failsafe" ); + qBubbleSort( sessionTypes ); + for (uint i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) { --- kdebase-3.5.6.orig/debian/patches/kubuntu_55_kdm_usplash_down.diff +++ kdebase-3.5.6/debian/patches/kubuntu_55_kdm_usplash_down.diff @@ -0,0 +1,36 @@ +--- kdebase-3.5.1/kdm/backend/dm.c 2005-11-08 22:36:58.000000000 +0000 ++++ kdebase-3.5.1/kdm/backend/dm.c 2006-03-17 11:51:07.000000000 +0000 +@@ -1409,6 +1409,9 @@ + AbortStartServer( d ); + d->idleTimeout = 0; + if (d->serverPid != -1 || d->pid != -1) { ++ if (system("test -x `pidof usplash`") == 0) { ++ system("/sbin/usplash_down 2>/dev/null"); ++ } + if (d->pid != -1) + TerminateProcess( d->pid, SIGTERM ); + if (d->serverPid != -1) +@@ -1425,17 +1428,20 @@ + #else + SwitchToTty( d ); + #endif +- } else if (endState == DS_RESERVE) ++ } else if (endState == DS_RESERVE) { + d->status = reserve; + #ifdef XDMCP +- else if (endState == DS_REMOTE) ++ } else if (endState == DS_REMOTE) { + StartRemoteLogin( d ); + #endif +- else { ++ } else { + #ifndef HAVE_VTS + SwitchToX( d ); + #endif + RemoveDisplay( d ); ++ if (system("test -x `pidof usplash`") == 0) { ++ system("/sbin/usplash_down 2>/dev/null"); ++ } + } + } + --- kdebase-3.5.6.orig/debian/patches/kubuntu_32_usplash_console_font.diff +++ kdebase-3.5.6/debian/patches/kubuntu_32_usplash_console_font.diff @@ -0,0 +1,14 @@ +--- kdebase/debian/kdm.init 2005-11-10 23:29:49.000000000 +0000 ++++ kdebase/debian/kdm.init 2005-11-11 00:35:13.000000000 +0000 +@@ -54,6 +54,11 @@ + [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then + echo "Not starting K Display Manager (kdm); it is not the default display manager." + else ++ # if usplash is runing, make sure to stop it now, yes "start" kills it. ++ if pidof usplash > /dev/null; then ++ DO_NOT_SWITCH_VT=yes /etc/init.d/usplash start ++ fi ++ + echo -n "Starting K Display Manager: kdm" + start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" + echo "." --- kdebase-3.5.6.orig/debian/patches/kubuntu_50_kate_desktop.diff +++ kdebase-3.5.6/debian/patches/kubuntu_50_kate_desktop.diff @@ -0,0 +1,12 @@ +diff -Nur kdebase-3.5.1/kate/data/kate.desktop kdebase-3.5.1.new/kate/data/kate.desktop +--- kdebase-3.5.1/kate/data/kate.desktop 2006-02-27 10:18:07.000000000 +0100 ++++ kdebase-3.5.1.new/kate/data/kate.desktop 2006-02-27 10:21:09.000000000 +0100 +@@ -75,7 +75,7 @@ + Name[pa]=ਕੇਟ + Name[ru]=Редактор Kate + MimeType=text/plain +-Exec=kate %U ++Exec=kate --use %U + X-KDE-StartupNotify=true + X-KDE-HasTempFileOption=true + Icon=kate --- kdebase-3.5.6.orig/debian/patches/kubuntu_53_kwallet_config.diff +++ kdebase-3.5.6/debian/patches/kubuntu_53_kwallet_config.diff @@ -0,0 +1,18 @@ +--- kdebase/startkde 2006-05-22 17:07:14.000000000 +0300 ++++ kdebase/startkde 2006-05-22 17:07:53.000000000 +0300 +@@ -326,6 +326,15 @@ + fi + fi + ++# configuration of kwalletmanager if not already set ++ ++if [ ! -e $HOME/.kde/share/config/kwalletrc ] && [ -e /usr/share/kubuntu-default-settings/kde-profile/default/share/config/kwalletrc ] ++then ++ mkdir -p "$HOME/.kde/share/config/" ++ cp -f /usr/share/kubuntu-default-settings/kde-profile/default/share/config/kwalletrc $HOME/.kde/share/config/ ++fi ++ ++ + # finally, give the session control to the session manager + # if the KDEWM environment variable has been set, then it will be used as KDE's + # window manager instead of kwin. --- kdebase-3.5.6.orig/debian/patches/kubuntu_48_hide_display.diff +++ kdebase-3.5.6/debian/patches/kubuntu_48_hide_display.diff @@ -0,0 +1,7 @@ +--- kdebase/kcontrol/display/display.desktop 2006-01-19 17:00:54.000000000 +0000 ++++ kdebase/kcontrol/display/display.desktop 2006-02-15 15:25:51.000000000 +0000 +@@ -135,3 +135,4 @@ + Comment[zh_CN]=显示设置 + Comment[zh_TW]=顯示設定 + Categories=Qt;KDE;X-KDE-settings-hardware; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_62_genkdmconf_fix.diff +++ kdebase-3.5.6/debian/patches/kubuntu_62_genkdmconf_fix.diff @@ -0,0 +1,12 @@ +diff -Nur kdebase-3.5.2/kdm/kfrontend/genkdmconf.c kdebase-3.5.2.new/kdm/kfrontend/genkdmconf.c +--- kdebase-3.5.2/kdm/kfrontend/genkdmconf.c 2006-05-01 11:23:42.000000000 +0200 ++++ kdebase-3.5.2.new/kdm/kfrontend/genkdmconf.c 2006-05-01 11:24:22.000000000 +0200 +@@ -666,7 +666,7 @@ + " xsess_tmp="; + static const char def_session2[] = + "\n" +-" $SHELL -c \"if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export > $xsess_tmp\"\n" ++" $SHELL -c \"if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export\" > $xsess_tmp\n" + " . $xsess_tmp\n" + " rm -f $xsess_tmp\n" + " ;;\n" --- kdebase-3.5.6.orig/debian/patches/24_knotify_arts.diff +++ kdebase-3.5.6/debian/patches/24_knotify_arts.diff @@ -0,0 +1,15 @@ +--- kde.orig/kcontrol/arts/arts.cpp ++++ kde.patched/kcontrol/arts/arts.cpp +@@ -385,6 +385,12 @@ + + delete midiConfig; + ++ KConfig *knotifyConfig = new KConfig( "knotifyrc", false ); ++ knotifyConfig->setGroup( "StartProgress" ); ++ knotifyConfig->writeEntry( "Arts Init", startServer->isChecked()); ++ knotifyConfig->writeEntry( "Use Arts", startServer->isChecked()); ++ delete knotifyConfig; ++ + config->sync(); + } + --- kdebase-3.5.6.orig/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kicker/kicker/kcmkicker.desktop 2005-03-17 01:03:22.645846992 +0000 ++++ kdebase/kicker/kicker/kcmkicker.desktop 2005-03-17 01:03:30.907591016 +0000 +@@ -67,3 +67,4 @@ + X-KDE-StartupNotify=true + OnlyShowIn=KDE; + Categories=Qt;KDE;Settings; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/26_face_load.diff +++ kdebase-3.5.6/debian/patches/26_face_load.diff @@ -0,0 +1,53 @@ +--- kde.orig/kdm/kfrontend/kgreeter.cpp ++++ kde.patched/kdm/kfrontend/kgreeter.cpp +@@ -167,6 +167,13 @@ + KGreeter::insertUser( const QImage &default_pix, + const QString &username, struct passwd *ps ) + { ++ if (setegid( ps->pw_gid )) ++ return; ++ if (seteuid( ps->pw_uid )) { ++ setegid(0); ++ return; ++ } ++ + if (userList) + userList->append( username ); + if (!userView) +@@ -202,6 +209,9 @@ + realname.append( "\n" ).append( username ); + new UserListViewItem( userView, realname, QPixmap( p ), username ); + } ++ ++ seteuid( 0 ); ++ setegid( 0 ); + } + + class KCStringList : public QValueList { +@@ -248,15 +258,8 @@ + { + struct passwd *ps; + +- // XXX remove seteuid-voodoo when we run as nobody + if (!(ps = getpwnam( "nobody" ))) + return; +- if (setegid( ps->pw_gid )) +- return; +- if (seteuid( ps->pw_uid )) { +- setegid(0); +- return; +- } + + QImage default_pix; + if (userView) { +@@ -320,10 +323,6 @@ + if (userList) + userList->sort(); + } +- +- // XXX remove seteuid-voodoo when we run as nobody +- seteuid( 0 ); +- setegid( 0 ); + } + + void --- kdebase-3.5.6.orig/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/konqueror/konquerorsu.desktop 2006-10-03 11:48:15.000000000 +0000 ++++ kdebase/konqueror/konquerorsu.desktop 2006-10-03 11:49:51.000000000 +0000 +@@ -82,3 +82,4 @@ + + Categories=Qt;KDE;System;X-KDE-More; + NotShowIn=GNOME; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kmenuedit/kmenuedit.desktop-orig 2005-03-17 01:06:56.707304704 +0000 ++++ kdebase/kmenuedit/kmenuedit.desktop 2005-03-17 01:07:22.785340240 +0000 +@@ -82,3 +82,4 @@ + + X-DCOP-ServiceType=Unique + Categories=Qt;KDE;Settings; ++OnlyShowIn=Old; --- kdebase-3.5.6.orig/debian/patches/kubuntu_82_safari_useragent.diff +++ kdebase-3.5.6/debian/patches/kubuntu_82_safari_useragent.diff @@ -0,0 +1,11 @@ +--- kdebase-3.5.4/kcontrol/kio/uasproviders/safari20.desktop 2006-07-22 09:15:33.000000000 +0100 ++++ kdebase-3.5.4/kcontrol/kio/uasproviders/safari20.desktop 2006-09-18 16:31:42.000000000 +0100 +@@ -25,7 +25,7 @@ + Type=Service + ServiceTypes=UserAgentStrings + X-KDE-UA-TAG=SAF +-X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; PPC Mac OS X; appLanguage) AppleWebKit/412 (KHTML, like Gecko) Safari/412 ++X-KDE-UA-FULL=Mozilla/5.0 (Macintosh; U; PPC Mac OS X; appLanguage) AppleWebKit/418.8 (KHTML, like Gecko) Safari/419.3 + X-KDE-UA-NAME=Safari + X-KDE-UA-VERSION=2.0 + X-KDE-UA-SYSNAME=Mac OS --- kdebase-3.5.6.orig/debian/patches/25_khelp_htdig.diff +++ kdebase-3.5.6/debian/patches/25_khelp_htdig.diff @@ -0,0 +1,39 @@ +--- kde.orig/khelpcenter/searchhandlers/khc_docbookdig.pl.in ++++ kde.patched/khelpcenter/searchhandlers/khc_docbookdig.pl.in +@@ -29,7 +29,9 @@ + my $htdigdata = "/srv/www/htdig/common/"; + my $htdigbin = "/usr/bin"; + my $kdeprefix = "@prefix@"; ++my $kdehtmldir = `kde-config --expandvars --install html`; + chomp $kdeprefix; ++chomp $kdehtmldir; + + my $dbg = 1; + +@@ -89,7 +91,7 @@ + $ENV{ CDPATH } = ''; + $ENV{ ENV } = ''; + +-my $findpath = "$kdeprefix/share/doc/HTML/$lang/"; ++my $findpath = "$kdehtmldir/$lang/"; + my $findcmd = "find $findpath -name index.docbook"; + + print STDERR "FINDCMD: $findcmd\n"; +@@ -140,7 +142,7 @@ + help:/*) + orig=\${orig/help:\\//} + orig=\${orig/\/index.docbook/} +- cd $kdeprefix/share/doc/HTML/en/\$orig ++ cd $kdehtmldir/en/\$orig + file=index.docbook + ;; + *) +@@ -167,7 +169,7 @@ + locale: $locale + database_dir: $htdigdb + database_base: \${database_dir}/$identifier +-local_urls: help://=$kdeprefix/share/doc/HTML/en/ file://=/ ++local_urls: help://=$kdehtmldir/en/ file://=/ + local_urls_only: true + limit_urls_to: file:// help:/ + ignore_noindex: true --- kdebase-3.5.6.orig/debian/patches/kubuntu_27_aboutscreen_searchbar.diff +++ kdebase-3.5.6/debian/patches/kubuntu_27_aboutscreen_searchbar.diff @@ -0,0 +1,135 @@ +diff -ur kdebase-orig/konqueror/about/konq_aboutpage.cc kdebase/konqueror/about/konq_aboutpage.cc +--- kdebase-orig/konqueror/about/konq_aboutpage.cc 2005-08-15 12:19:24.000000000 +0200 ++++ kdebase/konqueror/about/konq_aboutpage.cc 2005-08-27 14:32:25.000000000 +0200 +@@ -11,6 +11,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + #include +@@ -85,8 +88,11 @@ + + QString KonqAboutPageFactory::launch() + { ++ // FIXME: only regenerate launch page if kuriikwsfilterrc changed. ++ /* + if ( s_launch_html ) + return *s_launch_html; ++ */ + + QString res = loadFile( locate( "data", "konqueror/about/launch.html" )); + if ( res.isEmpty() ) +@@ -109,6 +115,26 @@ + else + res = res.arg( "" ); + ++ // Try to split page in three. If it succeeds, insert the default search into the middle part. ++ QStringList parts = QStringList::split( "", res ); ++ if ( parts.count() == 3 ) { ++ KConfig config( "kuriikwsfilterrc", true /*read-only*/, false /*no KDE globals*/ ); ++ config.setGroup( "General" ); ++ QString name = config.readEntry("DefaultSearchEngine"); ++ KService::Ptr service = ++ KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(name)); ++ if ( service ) { ++ QString searchBar = parts[1]; ++ searchBar = searchBar ++ .arg( iconSize ).arg( iconSize ) ++ .arg( service->name() ) ++ .arg( service->property("Keys").toStringList()[0] ) ++ ; ++ res = parts[0] + searchBar + parts[2]; ++ } ++ else res = parts[0] + parts[2]; ++ } ++ + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n("Conquer your Desktop!") ) +@@ -422,10 +448,18 @@ + + bool KonqAboutPage::openURL( const KURL &u ) + { +- if (u.url() == "about:plugins") +- serve( KonqAboutPageFactory::plugins(), "plugins" ); +- else serve( KonqAboutPageFactory::launch(), "konqueror" ); +- return true; ++ kdDebug(1202) << "now in KonqAboutPage::openURL( \"" << u.url() << "\" )" << endl; ++ if ( u.url() == "about:plugins" ) ++ serve( KonqAboutPageFactory::plugins(), "plugins" ); ++ else if ( !u.query().isEmpty() ) { ++ QMap< QString, QString > queryItems = u.queryItems( 0 ); ++ QMap< QString, QString >::ConstIterator query = queryItems.begin(); ++ QString newUrl = KURIFilter::self()->filteredURI( query.key() + ":" + query.data() ); ++ kdDebug(1202) << "scheduleRedirection( 0, \"" << newUrl << "\" )" << endl; ++ scheduleRedirection( 0, newUrl ); ++ } ++ else serve( KonqAboutPageFactory::launch(), "konqueror" ); ++ return true; + } + + bool KonqAboutPage::openFile() +diff -ur kdebase-orig/konqueror/about/konq.css kdebase/konqueror/about/konq.css +--- kdebase-orig/konqueror/about/konq.css 2005-08-15 12:19:24.000000000 +0200 ++++ kdebase/konqueror/about/konq.css 2005-08-27 14:34:08.000000000 +0200 +@@ -18,4 +18,11 @@ + background-repeat: no-repeat; + } + ++#searchbarlabel { ++ font-size: 10pt; ++ font-style: italic; ++} + ++#searchbarinput { ++ width: 100%; ++} +diff -ur kdebase-orig/konqueror/about/launch.html kdebase/konqueror/about/launch.html +--- kdebase-orig/konqueror/about/launch.html 2005-08-15 12:19:24.000000000 +0200 ++++ kdebase/konqueror/about/launch.html 2005-08-29 21:02:05.000000000 +0200 +@@ -60,6 +60,20 @@ +

+ + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + --- kdebase-3.5.6.orig/debian/patches/18_default_fonts.diff +++ kdebase-3.5.6/debian/patches/18_default_fonts.diff @@ -0,0 +1,120 @@ +--- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml ++++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml +@@ -113,12 +113,12 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + +--- kde.orig/kcontrol/kdm/kdm-font.cpp ++++ kde.patched/kcontrol/kdm/kdm-font.cpp +@@ -92,7 +92,7 @@ + { + stdFontChooser->setFont(QFont("Sans Serif", 10)); + failFontChooser->setFont(QFont("Sans Serif", 10, QFont::Bold)); +- greetingFontChooser->setFont(QFont("Serif", 20)); ++ greetingFontChooser->setFont(QFont("Sans Serif", 22)); + } + + void KDMFontWidget::save() +@@ -128,7 +128,7 @@ + void KDMFontWidget::defaults() + { + set_def(); +- aacb->setChecked(false); ++ aacb->setChecked(true); + } + + #include "kdm-font.moc" +--- kde.orig/kdm/config.def ++++ kde.patched/kdm/config.def +@@ -2096,19 +2096,19 @@ + # This needs to come _in front_ of the font settings to be effective! + Key: AntiAliasing + Type: bool +-Default: false ++Default: true + User: greeter +-Instance: #*/! ++Instance: */ + Comment: & + Description: + Whether the fonts used in the greeter should be antialiased. + + Key: GreetFont + Type: string +-Default: "Serif,20,5,0,50,0" ++Default: "Sans Serif,22,5,0,50,0" + CDefault: "Serif,20,bold" + User: greeter:font +-Instance: #*/"Serif,20,5,0,50,0" ++Instance: #*/"Sans Serif,22,5,0,50,0" + Comment: & + Description: + The font for the greeter headline. +--- kde.orig/kcontrol/fonts/fonts.cpp ++++ kde.patched/kcontrol/fonts/fonts.cpp +@@ -320,7 +320,7 @@ + kglobals.setReadDefaults( useDefaults ); + + kglobals.setGroup("General"); +- hStyle=KXftConfig::Hint::Medium; ++ hStyle=KXftConfig::Hint::Full; + xft.setHintStyle(hStyle); + xft.apply(); // Save this setting + kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle)); +@@ -438,7 +438,7 @@ + if(hintingStyle->currentText()==i18n(KXftConfig::description((KXftConfig::Hint::Style)s).utf8())) + return (KXftConfig::Hint::Style)s; + +- return KXftConfig::Hint::Medium; ++ return KXftConfig::Hint::Full; + } + #endif + +@@ -503,13 +503,13 @@ + QFont f0("Sans Serif", 10); + QFont f1("Monospace", 10); + QFont f2("Sans Serif", 10); +- QFont f3("Sans Serif", 9, QFont::Bold); ++ QFont f3("Sans Serif", 10, QFont::Bold); + QFont f4("Sans Serif", 10); + + f0.setPointSize(10); + f1.setPointSize(10); + f2.setPointSize(10); +- f3.setPointSize(9); ++ f3.setPointSize(10); + f4.setPointSize(10); + + defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0; +--- kde.orig/kcontrol/krdb/krdb.cpp ++++ kde.patched/kcontrol/krdb/krdb.cpp +@@ -511,11 +511,11 @@ + { + kglobals.setGroup("General"); + +- QString hintStyle(kglobals.readEntry("XftHintStyle", "hintmedium")), +- subPixel(kglobals.readEntry("XftSubPixel")); ++ QString hintStyle(kglobals.readEntry("XftHintStyle", "hintfull")), ++ subPixel(kglobals.readEntry("XftSubPixel", "none")); + + contents += "Xft.antialias: "; +- if(kglobals.readBoolEntry("XftAntialias", false)) ++ if(kglobals.readBoolEntry("XftAntialias", true)) + contents += "1"; + else + contents += "0"; --- kdebase-3.5.6.orig/debian/patches/kubuntu_52_gtk_qt_engine_config.diff +++ kdebase-3.5.6/debian/patches/kubuntu_52_gtk_qt_engine_config.diff @@ -0,0 +1,24 @@ +diff -Nur kdebase-3.5.6/startkde kdebase-3.5.6.new/startkde +--- kdebase-3.5.6/startkde 2007-03-23 20:18:10.000000000 +0100 ++++ kdebase-3.5.6.new/startkde 2007-03-23 20:19:04.000000000 +0100 +@@ -160,6 +160,20 @@ + EOF + fi + ++# configuration of the gtk_qt_engine if not already set ++ ++if [ ! -e $HOME/env/gtk-qt-engine.rc.sh ] && [ -e /usr/share/kubuntu-default-settings/gtk-qt-engine.rc.sh ] ++then ++ mkdir -p $HOME/.kde/env ++ cp -f /usr/share/kubuntu-default-settings/gtk-qt-engine.rc.sh $HOME/.kde/env ++ chmod 755 $HOME/.kde/env/gtk-qt-engine.rc.sh ++fi ++ ++if [ ! -e $HOME/.gtkrc-2.0-kde ] && [ -e /usr/share/kubuntu-default-settings/.gtkrc-2.0-kde ] ++then ++ cp -f /usr/share/kubuntu-default-settings/.gtkrc-2.0-kde $HOME ++fi ++ + # Source scripts found in /env/*.sh and /env/*.sh + # (where is $KDEHOME or ~/.kde, and is where KDE is installed) + # --- kdebase-3.5.6.orig/debian/patches/11_genkdmconf.diff +++ kdebase-3.5.6/debian/patches/11_genkdmconf.diff @@ -0,0 +1,162 @@ +--- kde.orig/kdm/kfrontend/genkdmconf.c ++++ kde.patched/kdm/kfrontend/genkdmconf.c +@@ -531,7 +531,7 @@ + "# right hand sides can match.\n" + "#\n" + "\n" +-"* #any host can get a login window\n" ++"#* #any host can get a login window\n" + "\n" + "#\n" + "# To hardwire a specific terminal to a specific host, you can\n" +@@ -549,7 +549,7 @@ + "# so this may not work in all environments.\n" + "#\n" + "\n" +-"* CHOOSER BROADCAST #any indirect host can get a chooser\n" ++"#* CHOOSER BROADCAST #any indirect host can get a chooser\n" + "\n" + "#\n" + "# If you'd prefer to configure the set of hosts each terminal sees,\n" +@@ -585,35 +585,25 @@ + "#! /bin/sh\n" + "# Xstartup - run as root before session starts\n" + "\n" +-"# By convention, both xconsole and xterm -C check that the\n" +-"# console is owned by the invoking user and is readable before attaching\n" +-"# the console output. This way a random user can invoke xterm -C without\n" +-"# causing serious grief; still, it can cause havoc, so xconsole is started\n" +-"# by Xsetup usually.\n" +-"# This is not required if you use PAM with the pam_console module.\n" +-"#\n" +-"#chown $USER /dev/console\n" ++"PATH=\"$PATH:/usr/bin/X11\"\n" + "\n" +-#ifdef _AIX +-"# We create a pseudodevice for finger. (host:0 becomes xdm/host_0)\n" +-"# Without it, finger errors out with \"Can't stat /dev/host:0\".\n" +-"#\n" +-"#devname=`echo $DISPLAY | cut -c1-8`\n" +-"#if [ ! -d /dev/xdm ]; then\n" +-"# mkdir /dev/xdm\n" +-"# chmod 755 /dev/xdm\n" +-"#fi\n" +-"#touch /dev/xdm/$devname\n" +-"#chmod 644 /dev/xdm/$devname\n" +-"#exec sessreg -a -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\"" +-#else +-"#exec sessreg -a -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\"" +-# ifdef BSD +-" -x " KDMCONF "/Xservers" +-# endif +-#endif /* _AIX */ +-" $USER\n" +-"\n# NOTE: The session is aborted if the last command returns non-zero.\n"; ++"if [ -e /etc/nologin ]; then\n" ++" # always display the nologin message, if possible\n" ++" if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n" ++" xmessage -file /etc/nologin -geometry 640x480\n" ++" fi\n" ++" if [ \"$(id -u)\" != \"0\" ] && \\\n" ++" ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n" ++" exit 1\n" ++" fi\n" ++"fi\n" ++"\n" ++"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n" ++" which sessreg > /dev/null 2>&1; then\n" ++" exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n" ++" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" ++" # NOTREACHED\n" ++"fi\n"; + + static const char def_reset[] = + "#! /bin/sh\n" +@@ -629,12 +619,13 @@ + "#devname=`echo $DISPLAY | cut -c1-8`\n" + "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\"" + #else +-"#exec sessreg -d -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\"" +-# ifdef BSD +-" -x " KDMCONF "/Xservers" +-# endif ++"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n" ++" which sessreg > /dev/null 2>&1; then\n" ++" exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n" ++" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" ++" # NOTREACHED\n" ++"fi\n"; + #endif /* _AIX */ +-" $USER\n"; + + static const char def_session1[] = + "#! /bin/sh\n" +@@ -666,6 +657,7 @@ + " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n" + " [ -f $zdir/zlogin ] && . $zdir/zlogin\n" + " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n" ++" setopt shwordsplit noextendedglob\n" + " ;;\n" + " */csh|*/tcsh)\n" + " # [t]cshrc is always sourced automatically.\n" +@@ -682,28 +674,8 @@ + " [ -f $HOME/.profile ] && . $HOME/.profile\n" + " ;;\n" + "esac\n" +-"\n" +-"[ -f /etc/xprofile ] && . /etc/xprofile\n" +-"[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" +-"\n" +-"case $session in\n" +-" \"\")\n" +-" exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n" +-" ;;\n" +-" failsafe)\n" +-" exec xterm -geometry 80x24-0-0\n" +-" ;;\n" +-" custom)\n" +-" exec $HOME/.xsession\n" +-" ;;\n" +-" default)\n" +-" exec " KDE_BINDIR "/startkde\n" +-" ;;\n" +-" *)\n" +-" eval exec \"$session\"\n" +-" ;;\n" +-"esac\n" +-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n"; ++"# invoke global X session script\n" ++". /etc/X11/Xsession\n"; + + static const char def_background[] = + "[Desktop0]\n" +@@ -978,29 +950,6 @@ + + if (maxTTY) + return; +- if (readFile( &it, "/etc/inittab" )) { +- usedFile( "/etc/inittab" ); +- for (p = it.buf; p < it.eof; p = eol + 1) { +- for (eol = p; eol < it.eof && *eol != '\n'; eol++); +- if (*p != '#') { +- if ((ep = mem_mem( p, eol - p, " tty", 4 )) && +- ep < eol && isdigit( *ep )) +- { +- if (ep + 1 == eol || isspace( *(ep + 1) )) +- tty = *ep - '0'; +- else if (isdigit( *(ep + 1) ) && +- (ep + 2 == eol || isspace( *(ep + 2) ))) +- tty = (*ep - '0') * 10 + (*(ep + 1) - '0'); +- else +- continue; +- TTYmask |= 1 << (tty - 1); +- if (tty > maxTTY) +- maxTTY = tty; +- } +- } +- } +- freeBuf( &it ); +- } + if (!maxTTY) { + maxTTY = 6; + TTYmask = 0x3f; --- kdebase-3.5.6.orig/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/klipper/klipper.desktop 2006-10-03 11:53:50.000000000 +0000 ++++ kdebase/klipper/klipper.desktop 2006-10-03 11:58:00.000000000 +0000 +@@ -143,3 +143,4 @@ + Comment[zh_CN]=剪贴历å²å·¥å…· + Comment[zh_TW]=å‰ªè²¼ç´€éŒ„å…¬ç”¨ç¨‹å¼ + ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_80_kdm_grub.diff +++ kdebase-3.5.6/debian/patches/kubuntu_80_kdm_grub.diff @@ -0,0 +1,35 @@ +diff -Nur kdebase-3.5.4/kdm/backend/bootman.c kdebase-3.5.4.new/kdm/backend/bootman.c +--- kdebase-3.5.4/kdm/backend/bootman.c 2005-09-10 10:26:12.000000000 +0200 ++++ kdebase-3.5.4.new/kdm/backend/bootman.c 2006-09-12 11:19:21.000000000 +0200 +@@ -82,7 +82,7 @@ + int len; + char line[1000]; + +- if (!grub && !(grub = locate( "grub" ))) ++ if (!grub && !(grub = locate( "grub-set-default" ))) + return BO_NOMAN; + + *def = 0; +@@ -130,19 +130,14 @@ + static void + commitGrub( void ) + { +- FILE *f; +- int pid; +- static const char *args[] = { 0, "--batch", "--no-floppy", 0 }; ++ char command[256]; + + if (sdRec.bmstamp != mTime( GRUB_MENU ) && + setGrub( sdRec.osname, &sdRec ) != BO_OK) + return; + +- args[0] = grub; +- if ((f = pOpen( (char **)args, 'w', &pid ))) { +- fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex ); +- pClose( f, pid ); +- } ++ sprintf(command, "%s %d", grub, sdRec.osindex); ++ system(command); + } + + static char *lilo; --- kdebase-3.5.6.orig/debian/patches/23_startkde_kpersonalizer.diff +++ kdebase-3.5.6/debian/patches/23_startkde_kpersonalizer.diff @@ -0,0 +1,35 @@ +--- kde.orig/startkde ++++ kde.patched/startkde +@@ -259,17 +259,21 @@ + + # run KPersonalizer before the session, if this is the first login + if test "$kpersonalizerrc_general_firstlogin" = "true"; then +- # start only dcopserver, don't start whole kdeinit (takes too long) +- echo 'startkde: Running kpersonalizer...' 1>&2 +- dcopserver +- kwin --lock & +- kpersonalizer --before-session +- # handle kpersonalizer restarts (language change) +- while test $? -eq 1; do +- kpersonalizer --r --before-session +- done +- dcopquit kwin +- dcopserver_shutdown --wait ++ if [ ! -x /usr/bin/kpersonalizer ]; then ++ echo 'startkde: kpersonalizer not found! Please install to properly configure your user.' 1>&2 ++ else ++ # start only dcopserver, don't start whole kdeinit (takes too long) ++ echo 'startkde: Running kpersonalizer...' 1>&2 ++ dcopserver ++ kwin --lock & ++ kpersonalizer --before-session ++ # handle kpersonalizer restarts (language change) ++ while test $? -eq 1; do ++ kpersonalizer --r --before-session ++ done ++ dcopquit kwin ++ dcopserver_shutdown --wait ++ fi + fi + + # the splashscreen and progress indicator --- kdebase-3.5.6.orig/debian/patches/kubuntu_76_kickermedia.diff +++ kdebase-3.5.6/debian/patches/kubuntu_76_kickermedia.diff @@ -0,0 +1,561 @@ +--- kdebase-3.5.6_orig/kicker/applets/media/Makefile.am 2006-07-22 10:15:16.000000000 +0200 ++++ kdebase-3.5.6/kicker/applets/media/Makefile.am 2007-02-08 00:14:36.000000000 +0100 +@@ -1,7 +1,7 @@ +-INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kicker/libkicker $(all_includes) ++INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kicker/libkicker $(all_includes) -I$(top_srcdir)/kioslave/media/libmediacommon + + kde_module_LTLIBRARIES = media_panelapplet.la +-media_panelapplet_la_SOURCES = preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp ++media_panelapplet_la_SOURCES = mediaapplet.skel preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp + + METASOURCES = AUTO + +@@ -13,7 +13,8 @@ + EXTRA_DIST = $(lnk_DATA) + + media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +-media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) ++media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la ../../../kioslave/media/libmediacommon/libmediacommon.la \ ++ $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) + + messages: rc.cpp + $(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot +--- kdebase-3.5.6_orig/kicker/applets/media/mediaapplet.cpp 2007-01-15 12:31:26.000000000 +0100 ++++ kdebase-3.5.6/kicker/applets/media/mediaapplet.cpp 2007-02-14 20:55:52.000000000 +0100 +@@ -26,8 +26,12 @@ + #include + #include + #include ++#include ++#include ++#include + + #include "mediaapplet.h" ++#include "medium.h" + + #include "preferencesdialog.h" + +@@ -46,35 +50,31 @@ + : KPanelApplet(configFile, type, actions, parent, name), + mButtonSizeSum(0) + { ++ DCOPObject::setObjId("StorageMediaApplet"); + if (!parent) + setBackgroundMode(X11ParentRelative); + + setAcceptDrops(true); +- ++ mMedia.setAutoDelete(true); ++ + loadConfig(); + +- mpDirLister = new KDirLister(); ++ DCOPClient *dcopClient = KApplication::dcopClient(); + +- connect( mpDirLister, SIGNAL( clear() ), +- this, SLOT( slotClear() ) ); +- connect( mpDirLister, SIGNAL( started(const KURL&) ), +- this, SLOT( slotStarted(const KURL&) ) ); +- connect( mpDirLister, SIGNAL( completed() ), +- this, SLOT( slotCompleted() ) ); +- connect( mpDirLister, SIGNAL( newItems( const KFileItemList & ) ), +- this, SLOT( slotNewItems( const KFileItemList & ) ) ); +- connect( mpDirLister, SIGNAL( deleteItem( KFileItem * ) ), +- this, SLOT( slotDeleteItem( KFileItem * ) ) ); +- connect( mpDirLister, SIGNAL( refreshItems( const KFileItemList & ) ), +- this, SLOT( slotRefreshItems( const KFileItemList & ) ) ); ++ dcopClient->connectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", ++ "StorageMediaApplet", "onMediumAdded(QString, bool)", true ); ++ ++ dcopClient->connectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", ++ "StorageMediaApplet", "onMediumAdded(QString, bool)", true ); ++ ++ dcopClient->connectDCOPSignal( "kded", "mediamanager", "mediumRemoved(QString, bool)", ++ "StorageMediaApplet", "onMediumRemoved(QString, bool)", true ); + + reloadList(); + } + + MediaApplet::~MediaApplet() + { +- delete mpDirLister; +- + while (!mButtonList.isEmpty()) + { + MediumButton *b = mButtonList.first(); +@@ -82,7 +82,7 @@ + delete b; + } + +- KGlobal::locale()->removeCatalogue("mediaapplet"); ++ KGlobal::locale()->removeCatalogue("mediaapplet"); + } + + void MediaApplet::about() +@@ -233,126 +233,179 @@ + emit updateLayout(); + } + +-void MediaApplet::slotClear() ++void MediaApplet::onMediumAdded( const QString &name, bool /* allowNotification */) + { +- kdDebug()<<"MediaApplet::slotClear"<setInteractive( false ); ++ ++ mJobDevNodeMap[job] = name; ++ mJobDevLabelMap[job] = thisMedium.label(); ++ ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotMediumStatResult( KIO::Job * ) ) ); + } +- +- arrangeButtons(); + } + +-void MediaApplet::slotStarted(const KURL &/*url*/) ++Medium MediaApplet::resolveDevNode(const QString &devNodeName) + { ++ Medium thisMedium(QString::null,QString::null); + ++ // We get the mount/media information from the KDE mediamanager, the ++ // same way as what the media:/ ioslave does. ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "fullList" ); ++ if ( !reply.isValid() ) ++ { ++ return thisMedium; ++ } ++ ++ Medium::List mediumList = Medium::createList(reply); ++ Medium::List::iterator it = mediumList.begin(); ++ Medium::List::iterator end = mediumList.end(); ++ ++ for(; it!=end; ++it) ++ { ++ if( (*it).name()==devNodeName) ++ { ++ return *it; ++ } ++ } ++ ++ // Couldn't find the medium entry. Sorry. ++ return thisMedium; + } + +-void MediaApplet::slotCompleted() +-{ +- mMedia = mpDirLister->items(KDirLister::AllItems); ++KURL MediaApplet::extractUrlFromMedium(const Medium &thisMedium) { ++ KURL thisUrl; ++ if(thisMedium.baseURL().startsWith("audiocd:")) ++ { ++ thisUrl = KURL("audiocd:/"); ++ } ++ else ++ { ++ if(thisMedium.mountPoint()!=QString::null && !thisMedium.baseURL().startsWith("camera:")) ++ { ++ thisUrl = KURL(thisMedium.mountPoint()); ++ } ++ else ++ { ++ thisUrl = KURL(thisMedium.baseURL()); ++ } ++ } ++ return thisUrl; + } + +-void MediaApplet::slotNewItems(const KFileItemList &entries) ++void MediaApplet::slotMediumStatResult( KIO::Job *job ) + { +- kdDebug()<<"MediaApplet::slotNewItems"<error() != 0 ) return; ++ ++ KIO::StatJob *stat_job = static_cast( job ); ++ ++ KIO::UDSEntry entry = stat_job->statResult(); ++ KURL url = stat_job->url(); ++ KFileItem newEntry( entry, url ); ++ QString devNodeName = mJobDevNodeMap[job]; ++ mJobDevNodeMap.remove( job ); ++ QString devNodeLabel = mJobDevLabelMap[job]; ++ mJobDevLabelMap.remove( job ); + +- for(KFileItemListIterator it(entries); it.current(); ++it) +- { +- kdDebug() << "item: " << it.current()->url() << endl; ++ newEntry.setName(QString("%1 (%2)").arg(devNodeLabel).arg(newEntry.name())); + +- bool found = false; +- MediumButtonList::iterator it2; +- MediumButtonList::iterator end = mButtonList.end(); +- for ( it2 = mButtonList.begin(); it2 != end; ++it2 ) ++ handleFileEntry(newEntry, devNodeName); ++} ++ ++void MediaApplet::handleFileEntry( const KFileItem &newEntry, const QString &devNodeName) { ++ ++ QString mimetype = newEntry.mimetype(); ++ bool found = false; ++ MediumButtonList::iterator it2; ++ MediumButtonList::iterator end2 = mButtonList.end(); ++ for ( it2 = mButtonList.begin(); it2 != end2; ++it2 ) ++ { ++ MediumButton *button = *it2; ++ ++ if(button->fileItem().url()==newEntry.url()) + { +- MediumButton *button = *it2; +- +- if(button->fileItem().url()==it.current()->url()) ++ if(mExcludedTypesList.contains(mimetype) ++ || mimetype=="media/cdrom_unmounted" ++ || mimetype=="media/removable_unmounted" ++ || mimetype=="media/camera_unmounted" ++ || mimetype=="media/dvd_unmounted" ++ || mimetype=="media/cdwriter_unmounted" ++ || mimetype=="media/zip_unmounted" ) + { + found = true; +- button->setFileItem(*it.current()); ++ mButtonList.remove(button); ++ delete button; ++ break; ++ } ++ else ++ { ++ found = true; ++ button->setFileItem( newEntry, devNodeName); + break; + } + } +- +- if(!found && !mExcludedList.contains(it.current()->url().url()) ) ++ } ++ ++ if(!found && !mExcludedList.contains(newEntry.url().url()) && !mExcludedTypesList.contains(mimetype) ) ++ { ++ MediumButton *button = new MediumButton(this, newEntry, devNodeName); ++ button->show(); ++ mButtonList.append(button); ++ } ++ ++ // Update the list of Medium objects. ++ KFileItemListIterator it(mMedia); ++ KFileItem *file; ++ while ( (file = it.current()) != 0 ) ++ { ++ ++it; ++ if(file->url()==newEntry.url()) + { +- MediumButton *button = new MediumButton(this, *it.current()); +- button->show(); +- mButtonList.append(button); ++ // Update the FileItem that we have stored up. ++ *file = newEntry; ++ break; + } + } ++ if(file==0) // Not found ++ { ++ mMedia.append(new KFileItem(newEntry)); ++ } + + arrangeButtons(); + } + +-void MediaApplet::slotDeleteItem(KFileItem *fileItem) ++void MediaApplet::onMediumRemoved( const QString &name, bool /*allowNotification*/ ) + { +- kdDebug()<<"MediumApplet::slotDeleteItem:"<< fileItem->url() << endl; +- + MediumButtonList::iterator it; + MediumButtonList::iterator end = mButtonList.end(); + for ( it = mButtonList.begin(); it != end; ++it ) + { + MediumButton *button = *it; +- +- if(button->fileItem().url()==fileItem->url()) ++ if(button->devNodeName()==name) + { + mButtonList.remove(button); + delete button; + break; + } + } +- slotCompleted(); +- arrangeButtons(); +-} +- +-void MediaApplet::slotRefreshItems(const KFileItemList &entries) +-{ +- for(KFileItemListIterator it(entries); it.current(); ++it) +- { +- kdDebug()<<"MediaApplet::slotRefreshItems:"<<(*it.current()).url().url()< + #endif +- ++#include + #include + #include + #include +@@ -33,12 +33,19 @@ + + #include + #include "mediumbutton.h" ++#include "medium.h" ++ + typedef QValueList MediumButtonList; + + +-class MediaApplet : public KPanelApplet ++class MediaApplet : public KPanelApplet, public DCOPObject + { + Q_OBJECT ++K_DCOP ++ ++k_dcop: ++ void onMediumAdded( const QString &name, bool allowNotification ); ++ void onMediumRemoved( const QString &name, bool allowNotification ); + + public: + MediaApplet(const QString& configFile, Type t = Normal, int actions = 0, +@@ -50,6 +57,7 @@ + void about(); + void preferences(); + ++ + protected: + void arrangeButtons(); + void resizeEvent(QResizeEvent *e); +@@ -60,20 +68,21 @@ + void mousePressEvent(QMouseEvent *e); + + protected slots: +- void slotClear(); +- void slotStarted(const KURL &url); +- void slotCompleted(); +- void slotNewItems(const KFileItemList &entries); +- void slotDeleteItem(KFileItem *fileItem); +- void slotRefreshItems(const KFileItemList &entries); ++ void slotMediumStatResult( KIO::Job *job ); + + private: +- KDirLister *mpDirLister; ++ + MediumButtonList mButtonList; + QStringList mExcludedTypesList; + QStringList mExcludedList; + KFileItemList mMedia; +- int mButtonSizeSum; ++ int mButtonSizeSum; ++ ++ Medium resolveDevNode(const QString &devNodeName); ++ KURL extractUrlFromMedium(const Medium &thisMedium); ++ void handleFileEntry( const KFileItem &newEntry, const QString &devNodeName ); ++ QMap mJobDevNodeMap; ++ QMap mJobDevLabelMap; + }; + + #endif +--- kdebase-3.5.6_orig/kicker/applets/media/mediumbutton.cpp 2006-01-19 18:01:42.000000000 +0100 ++++ kdebase-3.5.6/kicker/applets/media/mediumbutton.cpp 2007-02-18 12:36:30.000000000 +0100 +@@ -44,9 +44,11 @@ + #include + #include + +-MediumButton::MediumButton(QWidget *parent, const KFileItem &fileItem) ++MediumButton::MediumButton(QWidget *parent, const KFileItem &fileItem, const QString &devNodeName) + : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem) + { ++ mDevNodeName = devNodeName; ++ + KAction *a = KStdAction::paste(this, SLOT(slotPaste()), + &mActions, "pasteto"); + a->setShortcut(0); +@@ -81,9 +83,14 @@ + { + return mFileItem; + } ++const QString &MediumButton::devNodeName() const ++{ ++ return mDevNodeName; ++} + +-void MediumButton::setFileItem(const KFileItem &fileItem) ++void MediumButton::setFileItem(const KFileItem &fileItem, const QString &devNodeName) + { ++ mDevNodeName = devNodeName; + mFileItem.assign(fileItem); + setAcceptDrops(mFileItem.isWritable()); + setTitle(mFileItem.text()); +@@ -121,7 +128,15 @@ + { + KMimeType::Ptr mime = mFileItem.determineMimeType(); + QToolTip::add(this, mime->comment()); +- setIcon(mime->icon(QString::null, false)); ++ ++ if ( !mFileItem.iconName().isNull()) ++ { ++ setIcon(mFileItem.iconName()); ++ } ++ else ++ { ++ setIcon(mime->icon(QString::null, false)); ++ } + } + + // Activate this code only if we find a way to have both an +--- kdebase-3.5.6_orig/kicker/applets/media/mediumbutton.h 2005-10-10 17:03:59.000000000 +0200 ++++ kdebase-3.5.6/kicker/applets/media/mediumbutton.h 2007-02-08 00:14:36.000000000 +0100 +@@ -35,10 +35,11 @@ + Q_OBJECT + + public: +- MediumButton(QWidget *parent, const KFileItem &fileItem); ++ MediumButton(QWidget *parent, const KFileItem &fileItem, const QString &devNodeName); + ~MediumButton(); + const KFileItem &fileItem() const; +- void setFileItem(const KFileItem &fileItem); ++ const QString &devNodeName() const; ++ void setFileItem(const KFileItem &fileItem, const QString &devNodeName); + void setPanelPosition(KPanelApplet::Position position); + + protected: +@@ -61,6 +62,7 @@ + KActionCollection mActions; + KFileItem mFileItem; + QTimer mOpenTimer; ++ QString mDevNodeName; + }; + + #endif +--- kdebase-3.5.6_orig/kicker/applets/media/preferencesdialog.cpp 2005-10-10 17:03:59.000000000 +0200 ++++ kdebase-3.5.6/kicker/applets/media/preferencesdialog.cpp 2007-02-08 00:14:36.000000000 +0100 +@@ -123,7 +123,14 @@ + + for(; it != mimetypes.end(); ++it) + { +- if ((*it)->name().startsWith("media/")) ++ QString name = (*it)->name(); ++ if (name.startsWith("media/") ++ && name!="media/cdrom_unmounted" ++ && name!="media/removable_unmounted" ++ && name!="media/camera_unmounted" ++ && name!="media/dvd_unmounted" ++ && name!="media/cdwriter_unmounted" ++ && name!="media/zip_unmounted" ) + { + bool ok=excludedTypesList.contains((*it)->name())==0; + MediumTypeItem *item = new MediumTypeItem(mpMediumTypesListView, (*it)->comment(), (*it)->name()); +@@ -157,8 +164,7 @@ + ++it; + + bool ok = excludedList.contains(file->url().url())==0; +- MediumItem *item = new MediumItem(mpMediaListView, +- file->text(), *file); ++ MediumItem *item = new MediumItem(mpMediaListView, file->text()=="" ? "/" : file->text(), *file); + item->setOn(ok); + } + } --- kdebase-3.5.6.orig/debian/patches/kubuntu_91_ksplash_fork_too_early_cond.diff +++ kdebase-3.5.6/debian/patches/kubuntu_91_ksplash_fork_too_early_cond.diff @@ -0,0 +1,34 @@ +--- kdebase-3.5.2.orig/ksplashml/main.cpp 2005-09-10 03:25:51.000000000 -0500 ++++ kdebase-3.5.2/ksplashml/main.cpp 2006-05-30 22:37:44.000000000 -0500 +@@ -54,12 +54,6 @@ + KCmdLineArgs::addCmdLineOptions(options); + KCmdLineArgs *arg = KCmdLineArgs::parsedArgs(); + +- if( arg->isSet( "fork" ) ) +- { +- if (fork()) +- exit(0); +- } +- + if ( !( arg->isSet( "dcop" ) ) ) + KApplication::disableAutoDcopRegistration(); + else if ( KApplication::dcopClient()->attach() ) +@@ -75,6 +69,18 @@ + wndMain.setStartupItemCount( steps ); + } + ++ // The position of this fork() matters, fork too early and you risk the ++ // calls to KSplash::programStarted being missed. Now that wndMain has ++ // been instantiated it is safe to do this. An earlier version of ++ // this program had this fork occuring before the instantiation, ++ // and this led to a race condition where if ksplash lost the race it would ++ // hang because it would wait for signals that had already been sent ++ if( arg->isSet( "fork" ) ) ++ { ++ if (fork()) ++ exit(0); ++ } ++ + app.setMainWidget(&wndMain); + app.setTopWidget(&wndMain); + return(app.exec()); --- kdebase-3.5.6.orig/debian/patches/kubuntu_92_krandrtray_config.diff +++ kdebase-3.5.6/debian/patches/kubuntu_92_krandrtray_config.diff @@ -0,0 +1,12 @@ +diff -Nur kdebase-3.5.6/kcontrol/randr/krandrtray.cpp kdebase-3.5.6.new/kcontrol/randr/krandrtray.cpp +--- kdebase-3.5.6/kcontrol/randr/krandrtray.cpp 2005-10-10 17:03:49.000000000 +0200 ++++ kdebase-3.5.6.new/kcontrol/randr/krandrtray.cpp 2007-02-23 13:49:09.000000000 +0100 +@@ -247,7 +247,7 @@ + { + KCMultiDialog *kcm = new KCMultiDialog( KDialogBase::Plain, i18n( "Configure" ), this ); + +- kcm->addModule( "display" ); ++ kcm->addModule( "displayconfig" ); + kcm->setPlainCaption( i18n( "Configure Display" ) ); + kcm->exec(); + } --- kdebase-3.5.6.orig/debian/patches/kubuntu_83_media_desktop.diff +++ kdebase-3.5.6/debian/patches/kubuntu_83_media_desktop.diff @@ -0,0 +1,423 @@ +--- kdebase-3.5.6_orig/kdesktop/Makefile.am 2006-05-22 20:12:51.000000000 +0200 ++++ kdebase-3.5.6/kdesktop/Makefile.am 2007-02-08 00:14:37.000000000 +0100 +@@ -1,8 +1,8 @@ + ## Makefile.am of kdebase/kdesktop + +-INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes) ++INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib -I$(top_srcdir)/kioslave/media/libmediacommon $(all_includes) + kdesktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +-kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR) ++kdesktop_la_LIBADD = $(top_builddir)/kioslave/media/libmediacommon/libmediacommon.la libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR) + + SUBDIRS = . lock pics patterns programs init kwebdesktop + +@@ -18,7 +18,7 @@ + libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc klaunchsettings.kcfgc + + kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ +- lockeng.cc KDesktopIface.skel \ ++ lockeng.cc KDesktopIface.skel kdiconview.skel \ + bgmanager.cc init.cc KScreensaverIface.skel \ + minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ + startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \ +--- kdebase-3.5.6_orig/kdesktop/kdiconview.h 2007-01-15 12:32:10.000000000 +0100 ++++ kdebase-3.5.6/kdesktop/kdiconview.h 2007-02-14 08:35:17.000000000 +0100 +@@ -20,10 +20,13 @@ + #ifndef kdiconview_h + #define kdiconview_h + ++#include + #include + #include + #include + #include ++#include ++#include "medium.h" + + class KDirLister; + class KonqSettings; +@@ -43,6 +46,7 @@ + class KDIconView : public KonqIconViewWidget, public KDirNotify + { + Q_OBJECT ++ K_DCOP + + public: + KDIconView( QWidget *parent, const char* name = 0L ); +@@ -103,6 +107,10 @@ + + void startDirLister(); + ++k_dcop: ++ void onMediumAdded( const QString &name, bool allowNotification); ++ void onMediumRemoved( const QString &name, bool allowNotification); ++ + protected slots: + + // slots connected to the icon view +@@ -135,6 +143,8 @@ + + void slotNewMenuActivated(); + ++ void slotMediumStatResult( KIO::Job *job ); ++ + // For communication with KDesktop + signals: + void colorDropEvent( QDropEvent *e ); +@@ -153,6 +163,7 @@ + void refreshIcons(); + + ++ + protected: + void createActions(); + void setupSortKeys(); +@@ -184,6 +195,12 @@ + static void saveIconPosition(KSimpleConfig *config, int x, int y); + static void readIconPosition(KSimpleConfig *config, int &x, int &y); + ++ ++// KURL resolveDevNode(const QString &devNodeName); ++ Medium resolveDevNode(const QString &devNodeName); ++ KURL extractUrlFromMedium(const Medium &thisMedium); ++ void handleFileEntry( const KFileItem &newEntry, const QString &devNodeName ); ++ + /** Our action collection, parent of all our actions */ + KActionCollection m_actionCollection; + +@@ -251,6 +268,12 @@ + // did we already get the correct desktopIconsArea (from kicker) + // needed when we want to line up icons on a grid + bool m_gotIconsArea; ++ ++ bool m_mediaInit; ++ ++ QMap mJobDevNodeMap; ++ QMap mDevNodeFileItemMap; ++ QMap mJobDevLabelMap; + }; + + #endif +--- kdebase-3.5.6_orig/kdesktop/kdiconview.cc 2007-01-15 12:32:10.000000000 +0100 ++++ kdebase-3.5.6/kdesktop/kdiconview.cc 2007-02-16 22:36:08.000000000 +0100 +@@ -58,6 +58,7 @@ + #include "kshadowengine.h" + #include "kdesktopshadowsettings.h" + #include "kfileividesktop.h" ++#include "medium.h" + + // for multihead + extern int kdesktop_screen_number; +@@ -147,7 +148,8 @@ + m_eSortCriterion( NameCaseInsensitive ), + m_bSortDirectoriesFirst( true ), + m_itemsAlwaysFirst(), +- m_gotIconsArea(false) ++ m_gotIconsArea(false), ++ m_mediaInit(false) + { + setResizeMode( Fixed ); + setIconArea( desktopRect() ); // the default is the whole desktop +@@ -199,6 +201,16 @@ + delete m_dotDirectory; + delete m_dirLister; + delete m_shadowEngine; ++ ++ // Clean up our media KFileItem ++ QMap::Iterator it; ++ it = mDevNodeFileItemMap.begin(); ++ while(it != mDevNodeFileItemMap.end() ) ++ { ++ delete it.data(); ++ it = mDevNodeFileItemMap.begin(); ++ } ++ + } + + void KDIconView::initDotDirectories() +@@ -268,7 +280,6 @@ + void KDIconView::initConfig( bool init ) + { + //kdDebug() << "initConfig " << init << endl; +- + if ( !init ) { + KonqFMSettings::reparseConfiguration(); + KDesktopSettings::self()->readConfig(); +@@ -378,36 +389,195 @@ + void KDIconView::configureMedia() + { + kdDebug(1204) << "***********KDIconView::configureMedia() " <setMimeExcludeFilter(m_excludedMedia); +- m_dirLister->emitChanges(); + updateContents(); +- if (m_enableMedia) ++ ++ // Connect up the DCOP signals. ++ if(!m_mediaInit) + { +- for (KURL::List::Iterator it1=m_mergeDirs.begin();it1!=m_mergeDirs.end();++it1) +- { +- if ((*it1).url()=="media:/") return; +- } +- m_mergeDirs.append(KURL("media:/")); +- m_dirLister->openURL(KURL("media:/"),true); ++ // Load in the current list of media ++ ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "fullList" ); ++ if ( reply.isValid() ) ++ { ++ Medium::List mediumList = Medium::createList(reply); ++ Medium::List::iterator it = mediumList.begin(); ++ Medium::List::iterator end = mediumList.end(); ++ ++ Medium thisMedium(QString::null,QString::null); ++ ++ for(; it!=end; ++it) ++ { ++ onMediumAdded( (*it).name(), false); ++ } ++ } ++ ++ // Hook up the signals from the mediamanager. ++ connectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", ++ "onMediumAdded(QString, bool)", true ); ++ ++ connectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", ++ "onMediumAdded(QString, bool)", true ); ++ ++ connectDCOPSignal( "kded", "mediamanager", "mediumRemoved(QString, bool)", ++ "onMediumRemoved(QString, bool)", true ); ++ ++ m_mediaInit = true; ++ } ++ ++} ++ ++void KDIconView::onMediumAdded( const QString &name, bool /* allowNotification */) ++{ ++ // This method handles medium added and medium changed signals. ++ Medium thisMedium = resolveDevNode(name); ++ KURL realUrl = extractUrlFromMedium(thisMedium); ++ if ( !realUrl.isValid() ) ++ { ++ onMediumRemoved(name,false); ++ return; ++ } ++ ++ if ( realUrl.protocol()=="audiocd" || realUrl.protocol()=="camera") ++ { ++ KFileItem newEntry( realUrl, thisMedium.mimeType(), S_IRUSR|S_IRGRP|S_IROTH ); ++ newEntry.setName(thisMedium.label()); ++ handleFileEntry(newEntry, name); + } + else + { +- for (KURL::List::Iterator it2=m_mergeDirs.begin();it2!=m_mergeDirs.end();++it2) +- { +- if ((*it2).url()=="media:/") ++ KIO::SimpleJob *job = KIO::stat( realUrl, false ); ++ job->setInteractive( false ); ++ ++ mJobDevNodeMap[job] = name; ++ mJobDevLabelMap[job] = thisMedium.label(); ++ ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotMediumStatResult( KIO::Job * ) ) ); ++ } ++} ++ ++Medium KDIconView::resolveDevNode(const QString &devNodeName) ++{ ++ Medium thisMedium(QString::null,QString::null); ++ ++ // We get the mount/media information from the KDE mediamanager, the ++ // same way as what the media:/ ioslave does. ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "fullList" ); ++ if ( !reply.isValid() ) ++ { ++ return thisMedium; ++ } ++ ++ Medium::List mediumList = Medium::createList(reply); ++ Medium::List::iterator it = mediumList.begin(); ++ Medium::List::iterator end = mediumList.end(); ++ ++ for(; it!=end; ++it) ++ { ++ if( (*it).name()==devNodeName) + { +- delete m_dirLister; +- m_dirLister=0; +- start(); +-// m_mergeDirs.remove(it2); +-// m_dirLister->stop("media"); +- return; ++//fprintf(stderr,"kdiconview.resolveDevNode(%s) found\n",devNodeName.latin1()); ++//fflush(stderr); ++ return *it; + } ++ } + +- } +- return; ++//fprintf(stderr,"kdiconview.resolveDevNode(%s) failed\n",devNodeName.latin1()); ++//fflush(stderr); ++ // Couldn't find the medium entry. Sorry. ++ return thisMedium; ++} ++ ++KURL KDIconView::extractUrlFromMedium(const Medium &thisMedium) { ++ KURL thisUrl; ++ if(thisMedium.baseURL().startsWith("audiocd:")) ++ { ++ thisUrl = KURL("audiocd:/"); ++ } ++ else ++ { ++ if(thisMedium.mountPoint()!=QString::null && !thisMedium.baseURL().startsWith("camera:")) ++ { ++ thisUrl = KURL(thisMedium.mountPoint()); ++ } ++ else ++ { ++ thisUrl = KURL(thisMedium.baseURL()); ++ } ++ } ++ return thisUrl; ++} ++ ++void KDIconView::slotMediumStatResult( KIO::Job *job ) ++{ ++ if ( job->error() != 0 ) return; ++ ++ KIO::StatJob *stat_job = static_cast( job ); ++ ++ KIO::UDSEntry entry = stat_job->statResult(); ++ KURL url = stat_job->url(); ++ KFileItem newEntry( entry, url ); ++ ++ QString devNodeName = mJobDevNodeMap[job]; ++ mJobDevNodeMap.remove( job ); ++ QString devNodeLabel = mJobDevLabelMap[job]; ++ mJobDevLabelMap.remove( job ); ++ ++ newEntry.setName(QString("%1 (%2)").arg(devNodeLabel).arg(newEntry.name())); ++ ++ handleFileEntry(newEntry, devNodeName); ++} ++ ++void KDIconView::handleFileEntry( const KFileItem &newEntry, const QString &devNodeName) { ++ if ( mDevNodeFileItemMap.contains(devNodeName) ) ++ { ++ // We already have this medium item. Just update it and send it on to the normal update code. ++ *(mDevNodeFileItemMap[devNodeName]) = newEntry; ++ KFileItemList itemList; ++ itemList.append( mDevNodeFileItemMap[devNodeName] ); ++ slotRefreshItems(itemList); + } ++ else ++ { ++ // New medium ++ KFileItem *newHeapEntry = new KFileItem( newEntry ); ++ QString mimetype = newHeapEntry->mimetype(); + ++ if( !(m_excludedMedia.contains(mimetype) ++ || mimetype=="media/cdrom_unmounted" ++ || mimetype=="media/removable_unmounted" ++ || mimetype=="media/camera_unmounted" ++ || mimetype=="media/dvd_unmounted" ++ || mimetype=="media/cdwriter_unmounted" ++ || mimetype=="media/zip_unmounted") ) ++ { ++ // Not banned. Show it. ++ KFileItemList itemList; ++ itemList.append(newHeapEntry); ++ mDevNodeFileItemMap[devNodeName] = newHeapEntry; ++ slotNewItems(itemList); ++ } ++ else ++ { ++ // Forget this medium. ++ delete newHeapEntry; ++ } ++ } ++ viewport()->repaint( FALSE ); ++ repaint( FALSE ); ++} ++ ++void KDIconView::onMediumRemoved( const QString &name, bool /*allowNotification*/ ) ++{ ++ if ( mDevNodeFileItemMap.contains(name) ) ++ { ++ KFileItem *item = mDevNodeFileItemMap[name]; ++ slotDeleteItem(item); ++ mDevNodeFileItemMap.remove(name); ++ delete item; ++ } + } + + void KDIconView::createActions() +@@ -431,9 +601,6 @@ + KAction *pasteTo = KStdAction::paste( this, SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" ); + pasteTo->setEnabled( false ); // only enabled during popupMenu() + +- KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); +- new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, SLOT( refreshIcons() ), &m_actionCollection, "reload" ); +- + (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); + (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, this, SLOT( slotProperties() ), &m_actionCollection, "properties" ); + KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" ); +@@ -886,6 +1053,11 @@ + QString desktopFile; + if ( item->isDir() && item->isLocalFile() ) + { ++ if ( item->url().url()=="file:///" ) // The root volume. ++ { ++ fileIVI->setText( "/" ); ++ return true; ++ } + KURL u( item->url() ); + u.addPath( ".directory" ); + // using KStandardDirs as this one checks for path being +@@ -963,12 +1135,15 @@ + if (!desktopPath.isEmpty() && url.isLocalFile() && !url.path().startsWith(desktopPath)) + { + QString fileName = url.fileName(); +- if (QFile::exists(desktopPath + fileName)) ++ if (!fileName.isNull() && QFile::exists(desktopPath + fileName)) ++ { + continue; // Don't duplicate entry +- ++ } + QString mostLocal = locate("appdata", "Desktop/"+fileName); + if (!mostLocal.isEmpty() && (mostLocal != url.path())) +- continue; // Don't duplicate entry ++ { ++ continue; // Don't duplicate entry ++ } + } + + // No delayed mimetype determination on the desktop +--- kdebase-3.5.6_orig/kcontrol/konq/desktopbehavior_impl.cpp 2006-10-01 19:31:48.000000000 +0200 ++++ kdebase-3.5.6/kcontrol/konq/desktopbehavior_impl.cpp 2007-02-08 00:14:37.000000000 +0100 +@@ -236,9 +236,16 @@ + QValueListIterator it2(mimetypes.begin()); + g_pConfig->setGroup( "Media" ); + enableMediaBox->setChecked(g_pConfig->readBoolEntry("enabled",false)); +- QString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); ++ QString excludedMedia=g_pConfig->readEntry("exclude","media/hdd_mounted"); + for (; it2 != mimetypes.end(); ++it2) { +- if ( ((*it2)->name().startsWith("media/")) ) ++ QString name = (*it2)->name(); ++ if ( name.startsWith("media/") ++ && name!="media/cdrom_unmounted" ++ && name!="media/removable_unmounted" ++ && name!="media/camera_unmounted" ++ && name!="media/dvd_unmounted" ++ && name!="media/cdwriter_unmounted" ++ && name!="media/zip_unmounted" ) + { + bool ok=excludedMedia.contains((*it2)->name())==0; + new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok); --- kdebase-3.5.6.orig/debian/patches/17_logitechmouse.diff +++ kdebase-3.5.6/debian/patches/17_logitechmouse.diff @@ -0,0 +1,57 @@ +--- kde.orig/kcontrol/input/consoleUserPerms ++++ kde.patched/kcontrol/input/consoleUserPerms +@@ -1,42 +1,16 @@ +-#!/bin/bash +-# +-# /etc/hotplug/usb/consoleUserPerms +-# +-# Sets up newly plugged in USB device so that the user who owns +-# the console according to pam_console can access it from user space +-# +-# Note that for this script to work, you'll need all of the following: +-# a) a line in the file /etc/hotplug/usb.usermap or another usermap file +-# in /etc/hotplug/usb/ that corresponds to the device you are using. +-# b) a setup using pam_console creates the respective lock files +-# containing the name of the respective user. You can check for that +-# by executing "echo `cat /var/{run,lock}/console.lock`" and +-# verifying the appropriate user is mentioned somewhere there. +-# c) a Linux kernel supporting hotplug and usbdevfs +-# d) the hotplug package (http://linux-hotplug.sourceforge.net/) +-# +-# In the usermap file, the first field "usb module" should be named +-# "consoleUserPerms" to invoke this script. +-# ++#!/bin/sh + +-if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] ++GROUP=plugdev ++ ++if [ "${ACTION}" = "add" ] + then +- # New code, using lock files instead of copying /dev/console permissions +- # This also works with non-kdm logins (e.g. on a virtual terminal) +- # Idea and code from Nalin Dahyabhai +- if [ -f /var/run/console.lock ] +- then +- CONSOLEOWNER=`cat /var/run/console.lock` +- elif [ -f /var/lock/console.lock ] +- then +- CONSOLEOWNER=`cat /var/lock/console.lock` +- else +- CONSOLEOWNER= +- fi +- if [ -n "$CONSOLEOWNER" ] +- then +- chmod 0000 "${DEVICE}" +- chown "$CONSOLEOWNER" "${DEVICE}" +- chmod 0600 "${DEVICE}" ++ if getent group $GROUP > /dev/null; then ++ N=0 ++ while [ ! -e $DEVICE ] && [ $N -lt 25 ]; do ++ sleep 1 ++ N=$(expr $N + 1) ++ done ++ chmod 660 "${DEVICE}" ++ chown root:$GROUP "${DEVICE}" + fi + fi --- kdebase-3.5.6.orig/debian/patches/kubuntu_40_xmkmf.diff +++ kdebase-3.5.6/debian/patches/kubuntu_40_xmkmf.diff @@ -0,0 +1,15 @@ +--- kdebase/kdm/configure.in.in 2006-01-19 17:03:15.000000000 +0000 ++++ kdebase/kdm/configure.in.in 2006-07-19 19:41:04.000000000 +0100 +@@ -11,10 +11,10 @@ + cat > Imakefile <<'EOF'[ + + acimake: +- @echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\"" ++ @echo "XBINDIR=\"/usr/bin\" XLIBDIR=\"$(LIBDIR)\"" + + ]EOF +- if $XMKMF >&5 2>&1 && test -f Makefile; then ++ if imake -I/usr/lib/X11/config -DTOPDIR=/etc/X11 -DCURDIR=. /etc/X11 >&5 2>&1 && test -f Makefile; then + kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"` + kde_cv_defines_imake_version=$imkv + else --- kdebase-3.5.6.orig/debian/patches/kubuntu_41_kcmdnssd_name_icon.diff +++ kdebase-3.5.6/debian/patches/kubuntu_41_kcmdnssd_name_icon.diff @@ -0,0 +1,14 @@ +--- kdebase-3.5.1/kcontrol/dnssd/kcm_kdnssd.desktop~ 2006-01-19 17:00:57.000000000 +0000 ++++ kdebase-3.5.1/kcontrol/dnssd/kcm_kdnssd.desktop 2006-01-23 15:23:12.000000000 +0000 +@@ -54,9 +54,9 @@ + Encoding=UTF-8 + Exec=kcmshell kcm_kdnssd + GenericName= +-Icon=blockdevice ++Icon=network_local + MimeType= +-Name=Service Discovery ++Name=Zeroconf Service Discovery + Name[af]=Dienste ontdekker + Name[bg]=Откриване на уÑлуги + Name[bn]=সারà§à¦­à¦¿à¦¸ উদà§à¦˜à¦¾à¦Ÿà¦¨ --- kdebase-3.5.6.orig/debian/patches/kubuntu_63_pot_generation_path.diff +++ kdebase-3.5.6/debian/patches/kubuntu_63_pot_generation_path.diff @@ -0,0 +1,22 @@ +--- ./kcontrol/locale/Makefile.am~ 2005-09-10 11:25:08.000000000 +0300 ++++ ./kcontrol/locale/Makefile.am 2006-05-09 18:06:52.000000000 +0300 +@@ -26,7 +26,7 @@ + + messages: + $(XGETTEXT) -ktranslate $(kcm_locale_la_SOURCES) -o $(podir)/kcmlocale.pot +- $(XGETTEXT) TIMEZONES -o $(podir)/../kdelibs/timezones.pot ++ $(XGETTEXT) TIMEZONES -o $(podir)/timezones.pot + + xdg_apps_DATA = language.desktop + +--- ./kdeprint/descriptions/Makefile.am~ 2005-09-10 11:25:38.000000000 +0300 ++++ ./kdeprint/descriptions/Makefile.am 2006-05-09 18:07:11.000000000 +0300 +@@ -18,7 +18,7 @@ + ./sortthem < printers.cpp | perl -n -e "print \"// xgettext: no-c-format\n\".\$$_;" > printers.new && mv printers.new $(srcdir)/printers.cpp + + messages: +- $(XGETTEXT) printers.cpp -o $(podir)/../kdelibs/ppdtranslations.pot ++ $(XGETTEXT) printers.cpp -o $(podir)/ppdtranslations.pot + + .PHONY: printers.cpp + --- kdebase-3.5.6.orig/debian/patches/kubuntu_84_group_toolbar_viewmode_icons.diff +++ kdebase-3.5.6/debian/patches/kubuntu_84_group_toolbar_viewmode_icons.diff @@ -0,0 +1,84 @@ +diff -Nur kdebase-3.5.4/konqueror/iconview/konq_iconview.desktop kdebase-3.5.4.new/konqueror/iconview/konq_iconview.desktop +--- kdebase-3.5.4/konqueror/iconview/konq_iconview.desktop 2006-05-22 20:12:51.000000000 +0200 ++++ kdebase-3.5.4.new/konqueror/iconview/konq_iconview.desktop 2006-09-26 19:12:13.000000000 +0200 +@@ -81,8 +81,5 @@ + X-KDE-BrowserView-AllowAsDefault=true + X-KDE-BrowserView-HideFromMenus=true + X-KDE-BrowserView-Args=IconView +-X-KDE-BrowserView-ModeProperty=viewMode +-X-KDE-BrowserView-ModePropertyValue=IconView +-X-KDE-BrowserView-Built-Into=konqueror + Icon=view_icon + InitialPreference=10 +diff -Nur kdebase-3.5.4/konqueror/iconview/konq_multicolumnview.desktop kdebase-3.5.4.new/konqueror/iconview/konq_multicolumnview.desktop +--- kdebase-3.5.4/konqueror/iconview/konq_multicolumnview.desktop 2006-05-22 20:12:51.000000000 +0200 ++++ kdebase-3.5.4.new/konqueror/iconview/konq_multicolumnview.desktop 2006-09-26 19:12:13.000000000 +0200 +@@ -80,8 +80,5 @@ + X-KDE-BrowserView-AllowAsDefault=true + X-KDE-BrowserView-HideFromMenus=true + X-KDE-BrowserView-Args=MultiColumnView +-X-KDE-BrowserView-ModeProperty=viewMode +-X-KDE-BrowserView-ModePropertyValue=MultiColumnView +-X-KDE-BrowserView-Built-Into=konqueror + Icon=view_multicolumn + InitialPreference=9 +diff -Nur kdebase-3.5.4/konqueror/konq_mainwindow.cc kdebase-3.5.4.new/konqueror/konq_mainwindow.cc +--- kdebase-3.5.4/konqueror/konq_mainwindow.cc 2006-09-26 19:12:09.000000000 +0200 ++++ kdebase-3.5.4.new/konqueror/konq_mainwindow.cc 2006-09-26 19:12:36.000000000 +0200 +@@ -2195,7 +2195,7 @@ + KService::Ptr serv = KService::serviceByDesktopName( ittb.current()->name() ); + if ( serv && viewModeActionKey( serv ) == currentServiceLibrary ) { + KToggleAction* ta = static_cast( ittb.current() ); +- ta->setChecked( true ); ++ ta->setChecked( false ); + QString servicename = m_currentView->service()->genericName(); + if (servicename.isEmpty()) + servicename = m_currentView->service()->name(); +@@ -5053,7 +5053,6 @@ + bool bIsCurrentView = (*it)->desktopEntryName() == m_currentView->service()->desktopEntryName(); + if ( bIsCurrentView ) + { +- (*mapIt)->setChecked( true ); + action->setChecked( true ); + } + +diff -Nur kdebase-3.5.4/konqueror/listview/konq_detailedlistview.desktop kdebase-3.5.4.new/konqueror/listview/konq_detailedlistview.desktop +--- kdebase-3.5.4/konqueror/listview/konq_detailedlistview.desktop 2006-05-22 20:12:51.000000000 +0200 ++++ kdebase-3.5.4.new/konqueror/listview/konq_detailedlistview.desktop 2006-09-26 19:12:13.000000000 +0200 +@@ -79,6 +79,5 @@ + X-KDE-Library=konq_listview + X-KDE-BrowserView-Args=DetailedList + X-KDE-BrowserView-HideFromMenus=true +-X-KDE-BrowserView-Built-Into=konqueror + Icon=view_detailed + InitialPreference=7 +diff -Nur kdebase-3.5.4/konqueror/listview/konq_infolistview.desktop kdebase-3.5.4.new/konqueror/listview/konq_infolistview.desktop +--- kdebase-3.5.4/konqueror/listview/konq_infolistview.desktop 2006-07-22 10:15:50.000000000 +0200 ++++ kdebase-3.5.4.new/konqueror/listview/konq_infolistview.desktop 2006-09-26 19:12:13.000000000 +0200 +@@ -76,6 +76,5 @@ + X-KDE-Library=konq_listview + X-KDE-BrowserView-Args=InfoListView + X-KDE-BrowserView-HideFromMenus=true +-X-KDE-BrowserView-Built-Into=konqueror + Icon=view_detailed + InitialPreference=7 +diff -Nur kdebase-3.5.4/konqueror/listview/konq_textview.desktop kdebase-3.5.4.new/konqueror/listview/konq_textview.desktop +--- kdebase-3.5.4/konqueror/listview/konq_textview.desktop 2006-05-22 20:12:51.000000000 +0200 ++++ kdebase-3.5.4.new/konqueror/listview/konq_textview.desktop 2006-09-26 19:12:13.000000000 +0200 +@@ -79,6 +79,5 @@ + X-KDE-Library=konq_listview + X-KDE-BrowserView-Args=TextView + X-KDE-BrowserView-HideFromMenus=true +-X-KDE-BrowserView-Built-Into=konqueror + Icon=view_text + InitialPreference=6 +diff -Nur kdebase-3.5.4/konqueror/listview/konq_treeview.desktop kdebase-3.5.4.new/konqueror/listview/konq_treeview.desktop +--- kdebase-3.5.4/konqueror/listview/konq_treeview.desktop 2006-05-22 20:12:51.000000000 +0200 ++++ kdebase-3.5.4.new/konqueror/listview/konq_treeview.desktop 2006-09-26 19:12:13.000000000 +0200 +@@ -81,6 +81,5 @@ + X-KDE-BrowserView-Args=MixedTree + X-KDE-BrowserView-HideFromMenus=true + X-KDE-BrowserView-HierarchicalView=true +-X-KDE-BrowserView-Built-Into=konqueror + Icon=view_tree + InitialPreference=8 --- kdebase-3.5.6.orig/debian/patches/kubuntu_18_kate_initial_preference.diff +++ kdebase-3.5.6/debian/patches/kubuntu_18_kate_initial_preference.diff @@ -0,0 +1,9 @@ +--- kdebase-3.4.0/kate/data/kate.desktop 2005-03-28 14:47:24.556772672 +0000 ++++ kdebase-3.4.0/kate/data/kate.desktop 2005-03-28 14:48:51.548547912 +0000 +@@ -76,5 +76,6 @@ + DocPath=kate/index.html + Type=Application + Terminal=false ++InitialPreference=8 + X-DCOP-ServiceType=Multi + Categories=Qt;KDE;TextEditor; --- kdebase-3.5.6.orig/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff +++ kdebase-3.5.6/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff @@ -0,0 +1,8 @@ +diff -Nur kdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop kdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop +--- kdebase-3.5.4/kcontrol/componentchooser/componentchooser.desktop 2006-07-22 10:15:23.000000000 +0200 ++++ kdebase-3.5.4.new/kcontrol/componentchooser/componentchooser.desktop 2006-09-08 13:42:48.000000000 +0200 +@@ -214,3 +214,4 @@ + Keywords[zu]=amalunga,umkhethi welunga,amathuluzi okusebenza,umxhasi weposi lekhomputha,umlingisi wethuluzi langaphandle + + Categories=Qt;KDE;X-KDE-settings-components; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_54_system_protocol_home_dir.diff +++ kdebase-3.5.6/debian/patches/kubuntu_54_system_protocol_home_dir.diff @@ -0,0 +1,21 @@ +diff -Nur kdebase-3.5.1/kioslave/system/systemimpl.cpp kdebase-3.5.1.new/kioslave/system/systemimpl.cpp +--- kdebase-3.5.1/kioslave/system/systemimpl.cpp 2005-10-10 17:04:01.000000000 +0200 ++++ kdebase-3.5.1.new/kioslave/system/systemimpl.cpp 2006-03-05 21:36:01.000000000 +0100 +@@ -228,8 +228,16 @@ + + QString new_filename = file; + new_filename.truncate(file.length()-8); +- addAtom(entry, KIO::UDS_URL, 0, "system:/"+new_filename); + ++ if ( desktop.readURL().isEmpty() ) ++ { ++ addAtom(entry, KIO::UDS_URL, 0, desktop.readPath()); ++ } ++ else ++ { ++ addAtom(entry, KIO::UDS_URL, 0, "system:/"+new_filename); ++ } ++ + addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); + --- kdebase-3.5.6.orig/debian/patches/15_cups_docroot.diff +++ kdebase-3.5.6/debian/patches/15_cups_docroot.diff @@ -0,0 +1,34 @@ +--- kde.orig/doc/kdeprint/cups-config.docbook ++++ kde.patched/doc/kdeprint/cups-config.docbook +@@ -487,11 +487,11 @@ + Server group + + The group the server runs under. Normally this must be +-sys, however you can ++lpadmin, however you can + configure things for another group as needed. + + +-Enter for example sys. ++Enter for example lpadmin. + + + +@@ -1012,7 +1012,7 @@ + + The root folder for &HTTP; documents that are served. By + default the compiled in folder, /usr/share/cups/doc ++class="directory">/usr/share/cups/doc-root + + + +@@ -1756,7 +1756,7 @@ + The group name for System or printer administration + access. The default varies depending on the operating system, but +-will be sys, lpadmin, system or root (checked for in that order). + --- kdebase-3.5.6.orig/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kpager/kpager.desktop 2005-11-08 22:36:23.000000000 +0000 ++++ kdebase/kpager/kpager.desktop 2005-11-11 00:25:22.000000000 +0000 +@@ -96,3 +96,4 @@ + X-KDE-StartupNotify=false + X-DCOP-ServiceType=Unique + Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_43_kdesu_terminal_output.diff +++ kdebase-3.5.6/debian/patches/kubuntu_43_kdesu_terminal_output.diff @@ -0,0 +1,11 @@ +--- kdebase/kdesu/kdesu/kdesu.cpp 2005-11-08 22:37:00.000000000 +0000 ++++ kdebase/kdesu/kdesu/kdesu.cpp 2006-01-20 15:13:25.000000000 +0000 +@@ -270,7 +270,7 @@ + + // Try to exec the command with kdesud. + bool keep = !args->isSet("n") && have_daemon; +- bool terminal = args->isSet("t"); ++ bool terminal = true; + bool new_dcop = args->isSet("newdcop"); + + QCStringList env; --- kdebase-3.5.6.orig/debian/patches/kubuntu_38_ksysguard_pot.diff +++ kdebase-3.5.6/debian/patches/kubuntu_38_ksysguard_pot.diff @@ -0,0 +1,9 @@ +--- kdebase/ksysguard/gui/Makefile.am 2005-12-17 18:19:46.000000000 +0000 ++++ kdebase/ksysguard/gui/Makefile.am 2005-12-17 18:20:43.000000000 +0000 +@@ -59,5 +59,5 @@ + + messages: rc.cpp + $(EXTRACTRC) `find . -name "*.ui"` >> rc.cpp +- $(EXTRACTATTR) --attr=display,title SystemLoad.sgrd KSysGuardApplet.xml >> rc.cpp ++ extractattr --attr=display,title SystemLoad.sgrd KSysGuardApplet.xml >> rc.cpp + $(XGETTEXT) `find . -name "*.cpp" -o -name "*.cc"` -o $(podir)/ksysguard.pot --- kdebase-3.5.6.orig/debian/patches/10_kdmrc_defaults_kubuntu.diff +++ kdebase-3.5.6/debian/patches/10_kdmrc_defaults_kubuntu.diff @@ -0,0 +1,98 @@ +--- kde.orig/kcontrol/kdm/kdm-appear.cpp ++++ kde.patched/kcontrol/kdm/kdm-appear.cpp +@@ -440,7 +440,7 @@ + config->setGroup("X-*-Greeter"); + + // Read the greeting string +- greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %s at %n"))); ++ greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Kubuntu at %n"))); + + // Regular logo or clock + QString logoArea = config->readEntry("LogoArea", "Logo" ); +@@ -483,7 +483,7 @@ + + void KDMAppearanceWidget::defaults() + { +- greetstr_lined->setText( i18n("Welcome to %s at %n") ); ++ greetstr_lined->setText( i18n("Welcome to Kubuntu at %n") ); + logoRadio->setChecked( true ); + slotAreaRadioClicked( KdmLogo ); + setLogo( "" ); +--- kde.orig/kdm/config.def ++++ kde.patched/kdm/config.def +@@ -47,11 +47,11 @@ + #endif + + #if defined(BSD) || defined(__linux__) +-# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games" +-# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR ++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games" ++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11" + #else +-# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games:/usr/ucb" +-# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR ":/etc:/usr/ucb" ++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games:/usr/ucb" ++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/etc:/usr/ucb" + #endif + + #if 0 /*def HASXDMAUTH*/ +@@ -1355,7 +1355,7 @@ + This string is subject to word splitting. + + The default is something reasonable for the system on which &kdm; was built, +- like /usr/X11R6/bin/X. ++ like /usr/bin/X. + + Key: ServerArgsLocal + Type: string +@@ -1921,10 +1921,10 @@ + + Key: SessionsDirs + Type: list +-Default: KDMDATA "/sessions" ++Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions" + User: core + User: greeter-c +-Instance: #*/"/etc/X11/sessions,/usr/share/xsessions" ++Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions" + Comment: + The directories containing session type definitions in .desktop format. + Description: +@@ -1948,7 +1948,7 @@ + + Key: UseSessReg + Type: bool +-Default: true ++Default: false + User: core + Instance: #*/! + Comment: +@@ -2044,9 +2044,9 @@ + + Key: GreetString + Type: string +-Default: "Welcome to %s at %n" ++Default: "Welcome to Kubuntu at %n" + User: greeter +-Instance: #*/"K Desktop Environment (%n)" ++Instance: #*/"Welcome to Kubuntu at %n" + Comment: + The headline in the greeter. The following character pairs are replaced: + - %d -> current display +@@ -2482,7 +2482,6 @@ + Default: 0 + User: greeter + Instance: #*/ +-Update: upd_forgingseed + Comment: + Random seed for forging saved session types, etc. of unknown users. + This value should be random but constant across the login domain. +@@ -2579,7 +2578,7 @@ + Type: bool + Default: true + User: greeter +-Instance: :*/false ++Instance: :*/true + Comment: & + Description: + Show the Restart X Server/Close Connection action in the greeter. --- kdebase-3.5.6.orig/debian/patches/kubuntu_77_kiosystem.diff +++ kdebase-3.5.6/debian/patches/kubuntu_77_kiosystem.diff @@ -0,0 +1,33 @@ +--- kdebase/kioslave/system/entries/media.desktop ++++ kdebase/kioslave/system/entries/media.desktop +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=Link +-URL=media:/ ++Path=/media + Icon=system + Name=Storage Media + Name[af]=Stoor Media +--- kdebase/kioslave/system/entries/remote.desktop ++++ kdebase/kioslave/system/entries/remote.desktop +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=Link +-URL=remote:/ ++Path=remote:/ + Icon=network + Name=Remote Places + Name[af]=Afgeleë Plekke +--- kdebase/kioslave/system/entries/users.desktop ++++ kdebase/kioslave/system/entries/users.desktop +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=Link +-URL=home:/ ++Path=/home + Icon=folder_home2 + Name=Users Folders + Name[af]=Gebruiker Gidse --- kdebase-3.5.6.orig/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop 2005-11-08 22:36:23.000000000 +0000 ++++ kdebase/kdeprint/kdeprintfax/kdeprintfax.desktop 2005-12-15 16:22:28.000000000 +0000 +@@ -90,3 +90,4 @@ + Terminal=false + X-DCOP-ServiceType=Multi + Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_76_ksmserver_suspend.diff +++ kdebase-3.5.6/debian/patches/kubuntu_76_ksmserver_suspend.diff @@ -0,0 +1,280 @@ +diff -Nur kdebase-3.5.5a.dfsg.1/ksmserver/Makefile.am kdebase-3.5.5a.dfsg.1.new/ksmserver/Makefile.am +--- kdebase-3.5.5a.dfsg.1/ksmserver/Makefile.am 2006-01-19 18:01:08.000000000 +0100 ++++ kdebase-3.5.5a.dfsg.1.new/ksmserver/Makefile.am 2006-12-07 00:56:36.000000000 +0100 +@@ -17,7 +17,7 @@ + + SUBDIRS = . + +-INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes) ++INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS) + + bin_PROGRAMS = + lib_LTLIBRARIES = +@@ -31,7 +31,7 @@ + KSMServerInterface.skel server.skel + + ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module +-ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) ++ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) $(HAL_LIBS) $(DBUS_LIBS) + + picsdir = $(kde_datadir)/ksmserver/pics + pics_DATA = shutdownkonq.png +@@ -44,7 +44,7 @@ + EXTRA_PROGRAMS = testsh + testsh_SOURCES = test.cpp + testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la ++testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) + + messages: + $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot +diff -Nur kdebase-3.5.5a.dfsg.1/ksmserver/Makefile.in kdebase-3.5.5a.dfsg.1.new/ksmserver/Makefile.in +--- kdebase-3.5.5a.dfsg.1/ksmserver/Makefile.in 2006-12-07 00:48:41.000000000 +0100 ++++ kdebase-3.5.5a.dfsg.1.new/ksmserver/Makefile.in 2006-12-07 00:56:36.000000000 +0100 +@@ -655,7 +655,7 @@ + xdg_directorydir = @xdg_directorydir@ + xdg_menudir = @xdg_menudir@ + SUBDIRS = . +-INCLUDES = -I$(top_srcdir)/kdmlib $(all_includes) ++INCLUDES = -I$(top_srcdir)/kdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS) + #>- lib_LTLIBRARIES = + #>+ 1 + lib_LTLIBRARIES = libkdeinit_ksmserver.la +@@ -685,7 +685,7 @@ + updatedir = $(kde_datadir)/kconf_update + testsh_SOURCES = test.cpp + testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la ++testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) + #>- all: all-recursive + #>+ 1 + all: docs-am all-recursive +@@ -1220,7 +1220,7 @@ + .NOEXPORT: + + #>+ 2 +-libkdeinit_ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) ++libkdeinit_ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) $(HAL_LIBS) $(DBUS_LIBS) + + #>+ 2 + libkdeinit_ksmserver_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries) +diff -Nur kdebase-3.5.5a.dfsg.1/ksmserver/shutdowndlg.cpp kdebase-3.5.5a.dfsg.1.new/ksmserver/shutdowndlg.cpp +--- kdebase-3.5.5a.dfsg.1/ksmserver/shutdowndlg.cpp 2006-03-17 11:17:10.000000000 +0100 ++++ kdebase-3.5.5a.dfsg.1.new/ksmserver/shutdowndlg.cpp 2006-12-07 00:57:06.000000000 +0100 +@@ -37,6 +37,10 @@ + #include + #include + #include ++#include ++ ++#include ++#include + + #include + #include +@@ -130,6 +134,8 @@ + buttonlay->addWidget( btnLogout ); + connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout())); + ++ m_halCtx = NULL; ++ + if (maysd) { + + // Shutdown +@@ -167,6 +173,87 @@ + btnReboot->setPopup(targets); + connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); + } ++ ++ // respect lock on resume & disable suspend/hibernate settings ++ // from power-manager ++ KConfig config("power-managerrc"); ++ bool disableSuspend = config.readBoolEntry("disableSuspend", false); ++ bool disableHibernate = config.readBoolEntry("disableHibernate", false); ++ m_lockOnResume = config.readBoolEntry("lockOnResume", true); ++ ++ bool canSuspend = false; ++ bool canHibernate = false; ++ ++ // Query HAL for suspend/resume support ++ m_halCtx = libhal_ctx_new(); ++ ++ DBusError error; ++ dbus_error_init(&error); ++ m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); ++ if (!m_dbusConn) ++ { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halCtx); ++ m_halCtx = NULL; ++ } ++ else ++ { ++ dbus_bus_register(m_dbusConn, &error); ++ if (dbus_error_is_set(&error)) ++ { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halCtx); ++ m_dbusConn = NULL; ++ m_halCtx = NULL; ++ } ++ else ++ { ++ libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn); ++ if (!libhal_ctx_init(m_halCtx, &error)) ++ { ++ if (dbus_error_is_set(&error)) ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halCtx); ++ m_dbusConn = NULL; ++ m_halCtx = NULL; ++ } ++ } ++ } ++ ++ if (m_halCtx) ++ { ++ if (libhal_device_get_property_bool(m_halCtx, ++ "/org/freedesktop/Hal/devices/computer", ++ "power_management.can_suspend_to_ram", ++ NULL)) ++ { ++ canSuspend = true; ++ } ++ ++ if (libhal_device_get_property_bool(m_halCtx, ++ "/org/freedesktop/Hal/devices/computer", ++ "power_management.can_suspend_to_disk", ++ NULL)) ++ { ++ canHibernate = true; ++ } ++ } ++ ++ if (canSuspend && !disableSuspend) ++ { ++ KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend Computer"), "suspend"), frame ); ++ btnSuspend->setFont( btnFont ); ++ buttonlay->addWidget( btnSuspend ); ++ connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend())); ++ } ++ ++ if (canHibernate && !disableHibernate) ++ { ++ KPushButton* btnHibernate = new KPushButton( KGuiItem( i18n("&Hibernate Computer"), "hibernate"), frame ); ++ btnHibernate->setFont( btnFont ); ++ buttonlay->addWidget( btnHibernate ); ++ connect(btnHibernate, SIGNAL(clicked()), SLOT(slotHibernate())); ++ } + } + + buttonlay->addStretch( 1 ); +@@ -181,6 +268,17 @@ + + } + ++KSMShutdownDlg::~KSMShutdownDlg() ++{ ++ if (m_halCtx) ++ { ++ DBusError error; ++ dbus_error_init(&error); ++ libhal_ctx_shutdown(m_halCtx, &error); ++ libhal_ctx_free(m_halCtx); ++ } ++} ++ + + void KSMShutdownDlg::slotLogout() + { +@@ -213,6 +311,52 @@ + accept(); + } + ++void KSMShutdownDlg::slotSuspend() ++{ ++ if (m_lockOnResume) { ++ DCOPRef("kdesktop", "KScreensaverIface").send("lock"); ++ } ++ ++ if (m_dbusConn) ++ { ++ DBusMessage *msg = dbus_message_new_method_call( ++ "org.freedesktop.Hal", ++ "/org/freedesktop/Hal/devices/computer", ++ "org.freedesktop.Hal.Device.SystemPowerManagement", ++ "Suspend"); ++ ++ int wakeup=0; ++ dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID); ++ ++ dbus_connection_send(m_dbusConn, msg, NULL); ++ ++ dbus_message_unref(msg); ++ } ++ ++ reject(); // continue on resume ++} ++ ++void KSMShutdownDlg::slotHibernate() ++{ ++ if (m_lockOnResume) { ++ DCOPRef("kdesktop", "KScreensaverIface").send("lock"); ++ } ++ ++ if (m_dbusConn) ++ { ++ DBusMessage *msg = dbus_message_new_method_call( ++ "org.freedesktop.Hal", ++ "/org/freedesktop/Hal/devices/computer", ++ "org.freedesktop.Hal.Device.SystemPowerManagement", ++ "Hibernate"); ++ ++ dbus_connection_send(m_dbusConn, msg, NULL); ++ ++ dbus_message_unref(msg); ++ } ++ ++ reject(); // continue on resume ++} + + bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, QString& bootOption ) + { +diff -Nur kdebase-3.5.5a.dfsg.1/ksmserver/shutdowndlg.h kdebase-3.5.5a.dfsg.1.new/ksmserver/shutdowndlg.h +--- kdebase-3.5.5a.dfsg.1/ksmserver/shutdowndlg.h 2006-01-19 18:01:08.000000000 +0100 ++++ kdebase-3.5.5a.dfsg.1.new/ksmserver/shutdowndlg.h 2006-12-07 00:57:06.000000000 +0100 +@@ -17,6 +17,11 @@ + + #include + ++/* We acknowledge the the dbus API is unstable */ ++#define DBUS_API_SUBJECT_TO_CHANGE ++#include ++#include ++ + // The (singleton) widget that makes the desktop gray. + class KSMShutdownFeedback : public QWidget + { +@@ -54,9 +59,11 @@ + void slotHalt(); + void slotReboot(); + void slotReboot(int); ++ void slotSuspend(); ++ void slotHibernate(); + + protected: +- ~KSMShutdownDlg() {}; ++ ~KSMShutdownDlg(); + + private: + KSMShutdownDlg( QWidget* parent, bool maysd, KApplication::ShutdownType sdtype ); +@@ -64,6 +71,9 @@ + QString m_bootOption; + QPopupMenu *targets; + QStringList rebootOptions; ++ LibHalContext* m_halCtx; ++ DBusConnection *m_dbusConn; ++ bool m_lockOnResume; + }; + + class KSMDelayedPushButton : public KPushButton --- kdebase-3.5.6.orig/debian/patches/kubuntu_70_hide_printers_desktop.diff +++ kdebase-3.5.6/debian/patches/kubuntu_70_hide_printers_desktop.diff @@ -0,0 +1,9 @@ +diff -Nur kdebase-3.5.4/kdeprint/printmgr/printers.desktop kdebase-3.5.4.new/kdeprint/printmgr/printers.desktop +--- kdebase-3.5.4/kdeprint/printmgr/printers.desktop 2006-07-22 10:15:47.000000000 +0200 ++++ kdebase-3.5.4.new/kdeprint/printmgr/printers.desktop 2006-08-21 22:20:40.000000000 +0200 +@@ -219,4 +219,4 @@ + Keywords[zh_TW]=print,printer,printing management,列å°,å°è¡¨æ©Ÿ,列å°ç®¡ç† + Keywords[zu]=shicilela,umshicileli,abaphathi boshicilelo + +-Categories=Qt;KDE;X-KDE-settings-hardware;Settings; ++Categories=Qt;KDE;X-KDE-settings-hardware; --- kdebase-3.5.6.orig/debian/patches/kubuntu_88_logout_fade.diff +++ kdebase-3.5.6/debian/patches/kubuntu_88_logout_fade.diff @@ -0,0 +1,278 @@ +diff -urN ksmserver/shutdowndlg.cpp /home/sfs/_devel/temp/kdebase-3.5.6/ksmserver/shutdowndlg.cpp +--- ksmserver/shutdowndlg.cpp 2007-02-04 02:18:30.000000000 +0100 ++++ kdebase-3.5.6/ksmserver/shutdowndlg.cpp 2007-02-04 02:22:48.000000000 +0100 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -46,6 +47,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -56,35 +58,187 @@ + + KSMShutdownFeedback::KSMShutdownFeedback() + : QWidget( 0L, "feedbackwidget", WType_Popup ), +- m_currentY( 0 ) ++ m_currentY( 0 ), ++ m_grayOpacity( 0.0f ), ++ m_compensation( 0.0f ), ++ m_fadeBackwards( FALSE ), ++ m_unfadedImage( QPixmap::grabWindow(qt_xrootwin(), 0, 0, QApplication::desktop()->width(), ++ QApplication::desktop()->height()).convertToImage() ), ++ m_grayImage(), ++ m_fadeTime(), ++ m_pmio() ++ + { + setBackgroundMode( QWidget::NoBackground ); + setGeometry( QApplication::desktop()->geometry() ); + QTimer::singleShot( 10, this, SLOT( slotPaintEffect() ) ); +- m_root.resize( width(), height() ); ++ m_root.resize( width(), height() ); // for the default logout + } + ++// called after stopping shutdown-feedback -> smooth fade-back to color-mode ++void KSMShutdownFeedback::fadeBack( void ) ++{ ++ m_fadeTime.restart(); ++ m_fadeBackwards = TRUE; ++ // its possible that we have to fade back, before all is completely gray, so we cannot start ++ // with completely gray when fading back... ++ m_compensation = 1.0f - m_grayOpacity; ++ // wait until we're completely back in color-mode... ++ while ( m_grayOpacity > 0.0f ) ++ slotPaintEffect(); ++} + + void KSMShutdownFeedback::slotPaintEffect() + { +- if ( m_currentY >= height() ) { +- if ( backgroundMode() == QWidget::NoBackground ) { +- setBackgroundMode( QWidget::NoBackground ); +- setBackgroundPixmap( m_root ); +- } +- return; ++ // determine which fade to use ++ if (KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true)) ++ { ++ ++ float doFancyLogoutAdditionalDarkness = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6); ++ ++ float doFancyLogoutFadeTime = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000); ++ ++ float doFancyLogoutFadeBackTime = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000); ++ ++ ++ // if slotPaintEffect() is called first time, we have to initialize the gray image ++ // we also could do that in the constructor, but then the displaying of the ++ // logout-UI would be too much delayed... ++ if ( m_grayImage.isNull() ) ++ { ++ m_grayImage = m_unfadedImage.copy(); ++ register uchar * r = m_grayImage.bits(); ++ register uchar * g = m_grayImage.bits() + 1; ++ register uchar * b = m_grayImage.bits() + 2; ++ uchar * end = m_grayImage.bits() + m_grayImage.numBytes(); ++ ++ while ( r != end ) { ++ *r = *g = *b = (uchar) ( ( (*r)*11 + ((*g)<<4) + (*b)*5 ) * doFancyLogoutAdditionalDarkness / 32.0f ); ++ r += 4; ++ g += 4; ++ b += 4; ++ } ++ // start timer which is used for cpu-speed-independent fading ++ m_fadeTime.start(); ++ m_rowsDone = 0; ++ } ++ ++ // return if fading is completely done... ++ if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) ) ++ return; ++ ++ ++ if ( m_fadeBackwards == FALSE ) ++ { ++ m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime; ++ if ( m_grayOpacity > 1.0f ) ++ m_grayOpacity = 1.0f; ++ } ++ else ++ { ++ m_grayOpacity = 1.0f - m_fadeTime.elapsed() / doFancyLogoutFadeBackTime - m_compensation; ++ if ( m_grayOpacity < 0.0f ) ++ m_grayOpacity = 0.0f; ++ } ++ ++ const int imgWidth = m_unfadedImage.width(); ++ int imgHeight = m_unfadedImage.height(); ++ int heightUnit = imgHeight / 3; ++ if( heightUnit < 1 ) ++ heightUnit = 1; ++ ++ int y1 = static_cast( imgHeight*m_grayOpacity - heightUnit + m_grayOpacity*heightUnit*2.0f ); ++ if( y1 > imgHeight ) ++ y1 = imgHeight; ++ ++ int y2 = y1+heightUnit; ++ if( y2 > imgHeight ) ++ y2 = imgHeight; ++ ++ if( m_fadeBackwards == FALSE ) ++ { ++ if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight ) ++ { ++ QImage img( imgWidth, y1-m_rowsDone, 32 ); ++ memcpy( img.bits(), m_grayImage.scanLine( m_rowsDone ), imgWidth*(y1-m_rowsDone)*4 ); ++ // conversion is slow as hell if desktop-depth != 24bpp... ++ QPixmap pm = m_pmio.convertToPixmap( img ); ++ bitBlt( this, 0, m_rowsDone, &pm ); ++ m_rowsDone = y1; ++ } ++ } ++ else ++ { ++ // when fading back we have to blit area which isnt gray anymore to unfaded image ++ if( y2 > 0 && y2 < imgHeight && m_rowsDone > y2 ) ++ { ++ QImage img( imgWidth, m_rowsDone-y2, 32 ); ++ memcpy( img.bits(), m_unfadedImage.scanLine( y2 ), imgWidth*(m_rowsDone-y2)*4 ); ++ // conversion is slow as hell if desktop-depth != 24bpp... ++ QPixmap pm = m_pmio.convertToPixmap( img ); ++ bitBlt( this, 0, y2, &pm ); ++ m_rowsDone = y2; ++ } ++ } ++ ++ int start_y1 = y1; ++ if( start_y1 < 0 ) ++ start_y1 = 0; ++ if( y2 > start_y1 ) ++ { ++ QImage img( imgWidth, y2-start_y1, 32 ); ++ memcpy( img.bits(), m_grayImage.scanLine( start_y1 ), ( y2-start_y1 ) * imgWidth * 4 ); ++ register uchar * rs = m_unfadedImage.scanLine( start_y1 ); ++ register uchar * gs = rs + 1; ++ register uchar * bs = gs + 1; ++ register uchar * rd = img.bits(); ++ register uchar * gd = rd + 1; ++ register uchar * bd = gd + 1; ++ for( int y = start_y1; y < y2; ++y ) ++ { ++ // linear gradients look bad, so use cos-function ++ short int opac = static_cast( 128 - cosf( M_PI*(y-y1)/heightUnit )*128.0f ); ++ for( short int x = 0; x < imgWidth; ++x ) ++ { ++ *rd += ( ( ( *rs - *rd ) * opac ) >> 8 ); ++ rs += 4; rd += 4; ++ *gd += ( ( ( *gs - *gd ) * opac ) >> 8 ); ++ gs += 4; gd += 4; ++ *bd += ( ( ( *bs - *bd ) * opac ) >> 8 ); ++ bs += 4; bd += 4; ++ } ++ } ++ // conversion is slow as hell if desktop-depth != 24bpp... ++ QPixmap pm = m_pmio.convertToPixmap( img ); ++ bitBlt( this, 0, start_y1, &pm ); ++ } ++ ++ QTimer::singleShot( 5, this, SLOT( slotPaintEffect() ) ); ++ ++ } ++ // standard logout fade ++ else ++ { ++ if ( m_currentY >= height() ) { ++ if ( backgroundMode() == QWidget::NoBackground ) { ++ setBackgroundMode( QWidget::NoBackground ); ++ setBackgroundPixmap( m_root ); ++ } ++ return; ++ } ++ ++ KPixmap pixmap; ++ pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ); ++ QImage image = pixmap.convertToImage(); ++ KImageEffect::blend( Qt::black, image, 0.4 ); ++ KImageEffect::toGray( image, true ); ++ pixmap.convertFromImage( image ); ++ bitBlt( this, 0, m_currentY, &pixmap ); ++ bitBlt( &m_root, 0, m_currentY, &pixmap ); ++ m_currentY += 10; ++ QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) ); + } + +- KPixmap pixmap; +- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ); +- QImage image = pixmap.convertToImage(); +- KImageEffect::blend( Qt::black, image, 0.4 ); +- KImageEffect::toGray( image, true ); +- pixmap.convertFromImage( image ); +- bitBlt( this, 0, m_currentY, &pixmap ); +- bitBlt( &m_root, 0, m_currentY, &pixmap ); +- m_currentY += 10; +- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) ); + } + + ////// +diff -urN ksmserver/shutdowndlg.h /home/sfs/_devel/temp/kdebase-3.5.6/ksmserver/shutdowndlg.h +--- ksmserver/shutdowndlg.h 2007-02-04 02:18:30.000000000 +0100 ++++ kdebase-3.5.6/ksmserver/shutdowndlg.h 2007-02-04 00:39:06.000000000 +0100 +@@ -8,6 +8,8 @@ + #define SHUTDOWNDLG_H + + #include ++#include ++#include + #include + #include + class QPushButton; +@@ -16,20 +18,21 @@ + class QTimer; + + #include ++#include + + /* We acknowledge the the dbus API is unstable */ + #define DBUS_API_SUBJECT_TO_CHANGE + #include + #include + +-// The (singleton) widget that makes the desktop gray. ++// The (singleton) widget that makes/fades the desktop gray. + class KSMShutdownFeedback : public QWidget + { + Q_OBJECT + + public: + static void start() { s_pSelf = new KSMShutdownFeedback(); s_pSelf->show(); } +- static void stop() { delete s_pSelf; s_pSelf = 0L; } ++ static void stop() { if ( s_pSelf != 0L ) s_pSelf->fadeBack(); delete s_pSelf; s_pSelf = 0L; } + static KSMShutdownFeedback * self() { return s_pSelf; } + + protected: +@@ -43,6 +46,16 @@ + KSMShutdownFeedback(); + int m_currentY; + QPixmap m_root; ++ void fadeBack( void ); ++ float m_grayOpacity; ++ float m_compensation; ++ bool m_fadeBackwards; ++ QImage m_unfadedImage; ++ QImage m_grayImage; ++ QTime m_fadeTime; ++ int m_rowsDone; ++ KPixmapIO m_pmio; ++ + }; + + --- kdebase-3.5.6.orig/debian/patches/kubuntu_42_konsole_root_shell.diff +++ kdebase-3.5.6/debian/patches/kubuntu_42_konsole_root_shell.diff @@ -0,0 +1,12 @@ +diff -Nur kdebase-3.5.0/konsole/other/su.desktop kdebase-3.5.0.new/konsole/other/su.desktop +--- kdebase-3.5.0/konsole/other/su.desktop 2005-11-08 23:36:43.000000000 +0100 ++++ kdebase-3.5.0.new/konsole/other/su.desktop 2006-01-11 18:36:27.381948336 +0100 +@@ -94,7 +94,7 @@ + Comment[xx]=xxNew Root Shellxx + Comment[zh_CN]=新建 Root Shell + Comment[zh_TW]=新增 Root Shell +-Exec=su - ++Exec=sudo su - + Schema=BlackOnLightYellow.schema + #Schema=Linux.schema + #VGA --- kdebase-3.5.6.orig/debian/patches/kubuntu_94_konqueror_nsplugins_amd64.diff +++ kdebase-3.5.6/debian/patches/kubuntu_94_konqueror_nsplugins_amd64.diff @@ -0,0 +1,20 @@ +--- kdebase-3.5.6/nsplugins/sdk/npapi.h.npapi-64bit-fixes 2005-05-23 14:14:25.000000000 +0200 ++++ kdebase-3.5.6.new/nsplugins/sdk/npapi.h 2006-11-13 10:49:45.000000000 +0100 +@@ -58,7 +58,7 @@ + typedef unsigned short uint16; + #endif + #ifndef _UINT32 +-#if defined(__alpha) ++#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__) + typedef unsigned int uint32; + #else /* __alpha */ + typedef unsigned long uint32; +@@ -68,7 +68,7 @@ typedef unsigned long uint32; + typedef short int16; + #endif + #ifndef _INT32 +-#if defined(__alpha) || defined(_AIX) ++#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__) + typedef int int32; + #else /* __alpha || _AIX */ + typedef long int32; --- kdebase-3.5.6.orig/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kpersonalizer/kpersonalizer.desktop-orig 2005-03-17 01:05:16.091600616 +0000 ++++ kdebase/kpersonalizer/kpersonalizer.desktop 2005-03-17 01:05:23.678447240 +0000 +@@ -77,3 +77,4 @@ + X-DCOP-ServiceType=Multi + Categories=Qt;KDE;Settings; + OnlyShowIn=KDE; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_30_startkde_background_colour.diff +++ kdebase-3.5.6/debian/patches/kubuntu_30_startkde_background_colour.diff @@ -0,0 +1,11 @@ +--- kdebase/startkde 2005-11-11 00:30:09.000000000 +0000 ++++ kdebase/startkde 2005-11-11 00:32:13.000000000 +0000 +@@ -19,7 +19,7 @@ + # people's heads. We use colours from the standard KDE palette for those with + # palettised displays. + if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then +- xsetroot -solid "#000000" ++ xsetroot -solid "#618DCC" + fi + + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading --- kdebase-3.5.6.orig/debian/patches/kubuntu_85_language_selector.diff +++ kdebase-3.5.6/debian/patches/kubuntu_85_language_selector.diff @@ -0,0 +1,105 @@ +diff -ur kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp +--- kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp 2005-10-10 16:03:47.000000000 +0100 ++++ kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp 2007-01-08 19:37:16.000000000 +0000 +@@ -47,7 +47,7 @@ + : QWidget (parent, name), + m_locale(locale) + { +- QGridLayout *lay = new QGridLayout(this, 3, 3, ++ QGridLayout *lay = new QGridLayout(this, 4, 3, + KDialog::marginHint(), + KDialog::spacingHint()); + +@@ -99,6 +99,65 @@ + + lay->setColStretch(1, 1); + lay->setColStretch(2, 1); ++ ++ // Added jriddell 2007-01-08, for Kubuntu Language Selector spec ++ QHBoxLayout* languageSelectorLayout = new QHBoxLayout(); ++ installLanguage = new QPushButton(i18n("Install New Language"), this); ++ languageSelectorLayout->addWidget(installLanguage); ++ uninstallLanguage = new QPushButton(i18n("Uninstall Language"), this); ++ languageSelectorLayout->addWidget(uninstallLanguage); ++ selectLanguage = new QPushButton(i18n("Select System Language"), this); ++ languageSelectorLayout->addWidget(selectLanguage); ++ languageSelectorLayout->addStretch(); ++ lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2); ++ ++ connect( installLanguage, SIGNAL(clicked()), this, SLOT(slotInstallLanguage()) ); ++ connect( uninstallLanguage, SIGNAL(clicked()), this, SLOT(slotUninstallLanguage()) ); ++ connect( selectLanguage, SIGNAL(clicked()), this, SLOT(slotSelectLanguage()) ); ++ ++} ++ ++void KLocaleConfig::slotInstallLanguage() ++{ ++ KProcess *proc = new KProcess; ++ ++ *proc << "kdesu"; ++ *proc << "qt-language-selector --mode install"; ++ QApplication::connect(proc, SIGNAL(processExited(KProcess *)), ++ this, SLOT(slotLanguageSelectorExited(KProcess *))); ++ setEnabled(false); ++ proc->start(); ++} ++ ++void KLocaleConfig::slotUninstallLanguage() ++{ ++ KProcess *proc = new KProcess; ++ ++ *proc << "kdesu"; ++ *proc << "qt-language-selector --mode uninstall"; ++ QApplication::connect(proc, SIGNAL(processExited(KProcess *)), ++ this, SLOT(slotLanguageSelectorExited(KProcess *))); ++ setEnabled(false); ++ proc->start(); ++} ++ ++void KLocaleConfig::slotSelectLanguage() ++{ ++ KProcess *proc = new KProcess; ++ ++ *proc << "kdesu"; ++ *proc << "qt-language-selector --mode select"; ++ QApplication::connect(proc, SIGNAL(processExited(KProcess *)), ++ this, SLOT(slotLanguageSelectorExited(KProcess *))); ++ setEnabled(false); ++ proc->start(); ++} ++ ++void KLocaleConfig::slotLanguageSelectorExited(KProcess *) ++{ ++ //reload here ++ loadLanguageList(); ++ setEnabled(true); + } + + void KLocaleConfig::slotAddLanguage(const QString & code) +Only in kdebase-3.5.5a.dfsg.1/kcontrol/locale/: kcmlocale.cpp~ +diff -ur kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h +--- kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h 2005-10-10 16:03:47.000000000 +0100 ++++ kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h 2007-01-08 19:09:33.000000000 +0000 +@@ -75,6 +75,11 @@ + void slotLanguageDown(); + void slotCheckButtons(); + ++ void slotInstallLanguage(); ++ void slotUninstallLanguage(); ++ void slotSelectLanguage(); ++ void slotLanguageSelectorExited(KProcess *); ++ + private: + QStringList languageList() const; + +@@ -90,6 +95,10 @@ + QPushButton * m_removeLanguage; + QPushButton * m_upButton; + QPushButton * m_downButton; ++ ++ QPushButton* installLanguage; ++ QPushButton* uninstallLanguage; ++ QPushButton* selectLanguage; + }; + + #endif --- kdebase-3.5.6.orig/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop 2005-03-17 02:18:04.198547424 +0000 ++++ kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop 2005-03-17 02:18:12.320312728 +0000 +@@ -71,3 +71,4 @@ + Terminal=false + InitialPreference=1 + Categories=Qt;KDE;Utility;X-KDE-More; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_79_kdm_halt.diff +++ kdebase-3.5.6/debian/patches/kubuntu_79_kdm_halt.diff @@ -0,0 +1,33 @@ +diff -Nur kdebase-3.5.4/kcontrol/kdm/kdm-shut.cpp kdebase-3.5.4.new/kcontrol/kdm/kdm-shut.cpp +--- kdebase-3.5.4/kcontrol/kdm/kdm-shut.cpp 2005-10-10 17:03:49.000000000 +0200 ++++ kdebase-3.5.4.new/kcontrol/kdm/kdm-shut.cpp 2006-09-11 15:17:16.000000000 +0200 +@@ -200,7 +200,7 @@ + + config->setGroup("Shutdown"); + restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot")); +- shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt")); ++ shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff")); + + bm_combo->setCurrentId(config->readEntry("BootManager", "None")); + } +@@ -210,7 +210,7 @@ + void KDMSessionsWidget::defaults() + { + restart_lined->setURL("/sbin/reboot"); +- shutdown_lined->setURL("/sbin/halt"); ++ shutdown_lined->setURL("/sbin/poweroff"); + + sdlcombo->setCurrentItem(SdAll); + sdrcombo->setCurrentItem(SdRoot); +diff -Nur kdebase-3.5.4/kdm/config.def kdebase-3.5.4.new/kdm/config.def +--- kdebase-3.5.4/kdm/config.def 2006-09-11 15:16:10.000000000 +0200 ++++ kdebase-3.5.4.new/kdm/config.def 2006-09-11 15:16:13.000000000 +0200 +@@ -42,7 +42,7 @@ + # define HALT_CMD "/usr/sbin/halt" + # define REBOOT_CMD "/usr/sbin/reboot" + #else +-# define HALT_CMD "/sbin/halt" ++# define HALT_CMD "/sbin/poweroff" + # define REBOOT_CMD "/sbin/reboot" + #endif + --- kdebase-3.5.6.orig/debian/patches/kubuntu_72_kxkb_xmodmap.diff +++ kdebase-3.5.6/debian/patches/kubuntu_72_kxkb_xmodmap.diff @@ -0,0 +1,35 @@ +--- kdebase-3.5.5a.dfsg.1/kxkb/extension.cpp-orig 2007-01-05 12:37:35.000000000 +0000 ++++ kdebase-3.5.5a.dfsg.1/kxkb/extension.cpp 2007-01-05 12:37:54.000000000 +0000 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -176,12 +177,18 @@ + if( !fullVariant.isNull() && !fullVariant.isEmpty() ) + p << "-variant" << fullVariant; + +- if (p.start(KProcess::Block) && p.normalExit() && (p.exitStatus() == 0)) { +- return true; //setGroup( group ); +- } +- else { +- return false; +- } ++ p.start(KProcess::Block); ++ ++ // reload ubuntu hotkey-setup keycode -> keysym maps ++ KProcess pXmodmap; ++ pXmodmap << "/usr/bin/xmodmap" << "/usr/share/apps/kxkb/ubuntu.xmodmap"; ++ pXmodmap.start(KProcess::Block); ++ ++ KProcess pXmodmapHome; ++ pXmodmapHome << "/usr/bin/xmodmap" << QDir::home().path() + ".Xmodmap"; ++ pXmodmapHome.start(KProcess::Block); ++ ++ return p.normalExit() && (p.exitStatus() == 0); + } + + bool XKBExtension::setGroup(unsigned int group) --- kdebase-3.5.6.orig/debian/patches/kubuntu_89_new_logout_ui.diff +++ kdebase-3.5.6/debian/patches/kubuntu_89_new_logout_ui.diff @@ -0,0 +1,1160 @@ +diff -Nur kdebase-3.5.6/kdm/kfrontend/kdmshutdown.cpp kdebase-3.5.6.new/kdm/kfrontend/kdmshutdown.cpp +--- kdebase-3.5.6/kdm/kfrontend/kdmshutdown.cpp 2007-03-05 10:34:15.000000000 +0000 ++++ kdebase-3.5.6.new/kdm/kfrontend/kdmshutdown.cpp 2007-03-05 10:38:33.000000000 +0000 +@@ -34,6 +34,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -459,76 +461,150 @@ + setDown( false ); + } + +- + KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent ) + : inherited( _parent ) + , targetList( 0 ) + { +- QHBoxLayout *hbox = new QHBoxLayout( this, KDmh, KDsh ); + +- QFrame *lfrm = new QFrame( this ); +- lfrm->setFrameStyle( QFrame::Panel | QFrame::Sunken ); +- hbox->addWidget( lfrm, AlignCenter ); +- QLabel *icon = new QLabel( lfrm ); +- icon->setPixmap( QPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) ); +- QVBoxLayout *iconlay = new QVBoxLayout( lfrm ); +- iconlay->addWidget( icon ); +- +- QVBoxLayout *buttonlay = new QVBoxLayout( hbox, KDsh ); +- +- buttonlay->addStretch( 1 ); +- +- KPushButton *btnHalt = new +- KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit" ), this ); +- buttonlay->addWidget( btnHalt ); +- connect( btnHalt, SIGNAL(clicked()), SLOT(slotHalt()) ); +- +- buttonlay->addSpacing( KDialog::spacingHint() ); +- +- KDMDelayedPushButton *btnReboot = new +- KDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); +- buttonlay->addWidget( btnReboot ); +- connect( btnReboot, SIGNAL(clicked()), SLOT(slotReboot()) ); +- +- GSet( 1 ); +- GSendInt( G_ListBootOpts ); +- if (GRecvInt() == BO_OK) { +- targetList = GRecvStrArr( 0 ); +- /*int def =*/ GRecvInt(); +- int cur = GRecvInt(); +- QPopupMenu *targets = new QPopupMenu( this ); +- for (int i = 0; targetList[i]; i++) { +- QString t( QString::fromLocal8Bit( targetList[i] ) ); +- targets->insertItem( i == cur ? +- i18n("current option in boot loader", +- "%1 (current)").arg( t ) : +- t, i ); +- } +- btnReboot->setPopup( targets ); +- connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); +- } +- GSet( 0 ); ++ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true); + +- buttonlay->addStretch( 1 ); ++ QVBoxLayout* vbox = new QVBoxLayout( this ); ++ QHBoxLayout *hbox = new QHBoxLayout( this, KDmh, KDsh ); ++ QFrame* lfrm = new QFrame( this ); ++ QHBoxLayout* hbuttonbox; + +- if (_scheduledSd != SHUT_NEVER) { +- KPushButton *btnSched = new +- KPushButton( KGuiItem( i18n("&Schedule...") ), this ); +- buttonlay->addWidget( btnSched ); +- connect( btnSched, SIGNAL(clicked()), SLOT(slotSched()) ); ++ if(doUbuntuLogout) ++ { ++ lfrm->setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); ++ lfrm->setLineWidth( style().pixelMetric( QStyle::PM_DefaultFrameWidth, lfrm ) ); ++ // we need to set the minimum size for the logout box, since it ++ // gets too small if there isn't all options available ++ lfrm->setMinimumSize(300,120); ++ vbox->addWidget( lfrm ); ++ vbox = new QVBoxLayout( lfrm, 2 * KDialog::marginHint(), ++ 2 * KDialog::spacingHint() ); ++ ++ // first line of buttons ++ hbuttonbox = new QHBoxLayout( vbox, 8 * KDialog::spacingHint() ); ++ hbuttonbox->setAlignment( Qt::AlignHCenter ); ++ ++ // Reboot ++ FlatButton* btnReboot = new FlatButton( lfrm ); ++ btnReboot->setTextLabel( i18n("&Restart"), false ); ++ btnReboot->setPixmap( DesktopIcon( "reload") ); ++ btnReboot->setAccel( ALT+Key_R ); ++ hbuttonbox->addWidget ( btnReboot); ++ connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot())); ++ ++ // Copied completely from the standard restart/shutdown dialog ++ GSet( 1 ); ++ GSendInt( G_ListBootOpts ); ++ if (GRecvInt() == BO_OK) { ++ targetList = GRecvStrArr( 0 ); ++ /*int def =*/ GRecvInt(); ++ int cur = GRecvInt(); ++ QPopupMenu *targets = new QPopupMenu( this ); ++ btnReboot->setPopupDelay(300); // visually add dropdown ++ for (int i = 0; targetList[i]; i++) { ++ QString t( QString::fromLocal8Bit( targetList[i] ) ); ++ targets->insertItem( i == cur ? ++ i18n("current option in boot loader", ++ "%1 (current)").arg( t ) : ++ t, i ); ++ } ++ btnReboot->setPopup( targets ); ++ connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); ++ } ++ GSet( 0 ); ++ // Copied completely from the standard restart/shutdown dialog + ++ // Shutdown ++ FlatButton* btnHalt = new FlatButton( lfrm ); ++ btnHalt->setTextLabel( i18n("&Turn Off"), false ); ++ btnHalt->setPixmap( DesktopIcon( "exit") ); ++ btnHalt->setAccel( ALT+Key_T ); ++ hbuttonbox->addWidget ( btnHalt ); ++ connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt())); ++ ++ // cancel buttonbox ++ QHBoxLayout* hbuttonbox2 = new QHBoxLayout( vbox, 8 * KDialog::spacingHint() ); ++ hbuttonbox2->setAlignment( Qt::AlignRight ); ++ ++ // Back to kdm ++ KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); ++ hbuttonbox2->addWidget( btnBack ); ++ connect(btnBack, SIGNAL(clicked()), SLOT(reject())); ++ ++ ++ } ++ else ++ { ++ lfrm->setFrameStyle( QFrame::Panel | QFrame::Sunken ); ++ hbox->addWidget( lfrm, AlignCenter ); ++ QLabel *icon = new QLabel( lfrm ); ++ icon->setPixmap( QPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) ); ++ QVBoxLayout *iconlay = new QVBoxLayout( lfrm ); ++ iconlay->addWidget( icon ); ++ ++ QVBoxLayout *buttonlay = new QVBoxLayout( hbox, KDsh ); ++ ++ buttonlay->addStretch( 1 ); ++ ++ KPushButton *btnHalt = new ++ KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit" ), this ); ++ buttonlay->addWidget( btnHalt ); ++ connect( btnHalt, SIGNAL(clicked()), SLOT(slotHalt()) ); ++ ++ buttonlay->addSpacing( KDialog::spacingHint() ); ++ ++ KDMDelayedPushButton *btnReboot = new ++ KDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); ++ buttonlay->addWidget( btnReboot ); ++ connect( btnReboot, SIGNAL(clicked()), SLOT(slotReboot()) ); ++ ++ GSet( 1 ); ++ GSendInt( G_ListBootOpts ); ++ if (GRecvInt() == BO_OK) { ++ targetList = GRecvStrArr( 0 ); ++ /*int def =*/ GRecvInt(); ++ int cur = GRecvInt(); ++ QPopupMenu *targets = new QPopupMenu( this ); ++ for (int i = 0; targetList[i]; i++) { ++ QString t( QString::fromLocal8Bit( targetList[i] ) ); ++ targets->insertItem( i == cur ? ++ i18n("current option in boot loader", ++ "%1 (current)").arg( t ) : ++ t, i ); ++ } ++ btnReboot->setPopup( targets ); ++ connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); ++ } ++ GSet( 0 ); ++ + buttonlay->addStretch( 1 ); ++ ++ if (_scheduledSd != SHUT_NEVER) { ++ KPushButton *btnSched = new ++ KPushButton( KGuiItem( i18n("&Schedule...") ), this ); ++ buttonlay->addWidget( btnSched ); ++ connect( btnSched, SIGNAL(clicked()), SLOT(slotSched()) ); ++ ++ buttonlay->addStretch( 1 ); ++ } ++ ++ buttonlay->addWidget( new KSeparator( this ) ); ++ ++ buttonlay->addSpacing( 0 ); ++ ++ KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this ); ++ buttonlay->addWidget( btnBack ); ++ connect( btnBack, SIGNAL(clicked()), SLOT(reject()) ); ++ ++ buttonlay->addSpacing( KDialog::spacingHint() ); ++ ++ + } + +- buttonlay->addWidget( new KSeparator( this ) ); +- +- buttonlay->addSpacing( 0 ); +- +- KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this ); +- buttonlay->addWidget( btnBack ); +- connect( btnBack, SIGNAL(clicked()), SLOT(reject()) ); +- +- buttonlay->addSpacing( KDialog::spacingHint() ); + } + + KDMSlimShutdown::~KDMSlimShutdown() +@@ -593,6 +669,129 @@ + } + + ++KSMPushButton::KSMPushButton( const KGuiItem &item, ++ QWidget *parent, ++ const char *name) ++ : KPushButton( item, parent, name), ++ m_pressed(false) ++{ ++ setDefault( false ); ++ setAutoDefault ( false ); ++} ++ ++void KSMPushButton::keyPressEvent( QKeyEvent* e ) ++{ ++ switch ( e->key() ) ++ { ++ case Key_Enter: ++ case Key_Return: ++ case Key_Space: ++ m_pressed = TRUE; ++ setDown(true); ++ emit pressed(); ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ } ++ ++ QPushButton::keyPressEvent(e); ++} ++ ++ ++void KSMPushButton::keyReleaseEvent( QKeyEvent* e ) ++{ ++ switch ( e->key() ) ++ { ++ case Key_Space: ++ case Key_Enter: ++ case Key_Return: ++ if ( m_pressed ) ++ { ++ setDown(false); ++ m_pressed = FALSE; ++ emit released(); ++ emit clicked(); ++ } ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ ++ } ++} ++ ++FlatButton::FlatButton( QWidget *parent, const char *name ) ++ : QToolButton( parent, name/*, WNoAutoErase*/ ), ++ m_pressed(false) ++{ ++ init(); ++} ++ ++ ++FlatButton::~FlatButton() {} ++ ++void FlatButton::init() ++{ ++ setUsesTextLabel(true); ++ setUsesBigPixmap(true); ++ setAutoRaise(true); ++ setTextPosition( QToolButton::Under ); ++ setFocusPolicy(QWidget::StrongFocus); ++ } ++ ++ ++void FlatButton::keyPressEvent( QKeyEvent* e ) ++{ ++ switch ( e->key() ) ++ { ++ case Key_Enter: ++ case Key_Return: ++ case Key_Space: ++ m_pressed = TRUE; ++ setDown(true); ++ emit pressed(); ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ } ++ ++ QToolButton::keyPressEvent(e); ++} ++ ++void FlatButton::keyReleaseEvent( QKeyEvent* e ) ++{ ++ switch ( e->key() ) ++ { ++ case Key_Space: ++ case Key_Enter: ++ case Key_Return: ++ if ( m_pressed ) ++ { ++ setDown(false); ++ m_pressed = FALSE; ++ emit released(); ++ emit clicked(); ++ } ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ } ++ ++} ++ ++ ++ + KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os, + QWidget *_parent ) + : inherited( _uid, _parent ) +diff -Nur kdebase-3.5.6/kdm/kfrontend/kdmshutdown.h kdebase-3.5.6.new/kdm/kfrontend/kdmshutdown.h +--- kdebase-3.5.6/kdm/kfrontend/kdmshutdown.h 2007-03-05 10:34:15.000000000 +0000 ++++ kdebase-3.5.6.new/kdm/kfrontend/kdmshutdown.h 2007-03-05 10:38:33.000000000 +0000 +@@ -32,6 +32,8 @@ + #include + + #include ++#include ++#include + + class QLabel; + class KPushButton; +@@ -193,4 +195,46 @@ + const char *os, QWidget *_parent ); + }; + ++class KSMPushButton : public KPushButton ++{ ++ Q_OBJECT ++ ++public: ++ ++ KSMPushButton( const KGuiItem &item, QWidget *parent, const char *name = 0 ); ++ ++protected: ++ virtual void keyPressEvent(QKeyEvent*e); ++ virtual void keyReleaseEvent(QKeyEvent*e); ++ ++private: ++ ++ bool m_pressed; ++ ++}; ++ ++class FlatButton : public QToolButton ++{ ++ Q_OBJECT ++ ++ public: ++ ++ FlatButton( QWidget *parent = 0, const char *name = 0 ); ++ ~FlatButton(); ++ ++ protected: ++ virtual void keyPressEvent(QKeyEvent*e); ++ virtual void keyReleaseEvent(QKeyEvent*e); ++ ++ private slots: ++ ++ private: ++ void init(); ++ ++ bool m_pressed; ++ QString m_text; ++ QPixmap m_pixmap; ++ ++}; ++ + #endif /* KDMSHUTDOWN_H */ +diff -Nur kdebase-3.5.6/ksmserver/shutdowndlg.cpp kdebase-3.5.6.new/ksmserver/shutdowndlg.cpp +--- kdebase-3.5.6/ksmserver/shutdowndlg.cpp 2007-03-05 10:36:21.000000000 +0000 ++++ kdebase-3.5.6.new/ksmserver/shutdowndlg.cpp 2007-03-05 10:38:35.000000000 +0000 +@@ -24,12 +24,15 @@ + #include + #include + #include ++#include ++#include + + #include + #include + #include + #include + #include ++#include + #include + #include + #include +@@ -49,6 +52,8 @@ + #include + #include + #include ++#include ++ + + #include + +@@ -162,8 +167,10 @@ + QImage img( imgWidth, y1-m_rowsDone, 32 ); + memcpy( img.bits(), m_grayImage.scanLine( m_rowsDone ), imgWidth*(y1-m_rowsDone)*4 ); + // conversion is slow as hell if desktop-depth != 24bpp... +- QPixmap pm = m_pmio.convertToPixmap( img ); +- bitBlt( this, 0, m_rowsDone, &pm ); ++ //Pixmap pm = m_pmio.convertToPixmap( img ); ++ //bitBlt( this, 0, m_rowsDone, &pm ); ++// QImage pm = m_pmio.convertToImage( img ); ++ bitBlt( this, 0, m_rowsDone, &img ); + m_rowsDone = y1; + } + } +@@ -175,8 +182,9 @@ + QImage img( imgWidth, m_rowsDone-y2, 32 ); + memcpy( img.bits(), m_unfadedImage.scanLine( y2 ), imgWidth*(m_rowsDone-y2)*4 ); + // conversion is slow as hell if desktop-depth != 24bpp... +- QPixmap pm = m_pmio.convertToPixmap( img ); +- bitBlt( this, 0, y2, &pm ); ++ //QPixmap pm = m_pmio.convertToPixmap( img ); ++ //bitBlt( this, 0, y2, &pm ); ++ bitBlt( this, 0, y2, &img ); + m_rowsDone = y2; + } + } +@@ -209,8 +217,9 @@ + } + } + // conversion is slow as hell if desktop-depth != 24bpp... +- QPixmap pm = m_pmio.convertToPixmap( img ); +- bitBlt( this, 0, start_y1, &pm ); ++ //QPixmap pm = m_pmio.convertToPixmap( img ); ++ //bitBlt( this, 0, start_y1, &pm ); ++ bitBlt( this, 0, start_y1, &img ); + } + + QTimer::singleShot( 5, this, SLOT( slotPaintEffect() ) ); +@@ -248,182 +257,320 @@ + : QDialog( parent, 0, TRUE, WType_Popup ), targets(0) + // this is a WType_Popup on purpose. Do not change that! Not + // having a popup here has severe side effects. ++ + { + QVBoxLayout* vbox = new QVBoxLayout( this ); ++ ++ + QFrame* frame = new QFrame( this ); + frame->setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); + frame->setLineWidth( style().pixelMetric( QStyle::PM_DefaultFrameWidth, frame ) ); ++ // we need to set the minimum size for the logout box, since it ++ // gets too small if there isn't all options available ++ frame->setMinimumSize(400,200); + vbox->addWidget( frame ); + vbox = new QVBoxLayout( frame, 2 * KDialog::marginHint(), + 2 * KDialog::spacingHint() ); + +- QLabel* label = new QLabel( i18n("End Session for \"%1\"").arg(KUser().loginName()), frame ); +- QFont fnt = label->font(); +- fnt.setBold( true ); +- fnt.setPointSize( fnt.pointSize() * 3 / 2 ); +- label->setFont( fnt ); +- vbox->addWidget( label, 0, AlignHCenter ); +- +- QHBoxLayout* hbox = new QHBoxLayout( vbox, 2 * KDialog::spacingHint() ); +- +- // konqy +- QFrame* lfrm = new QFrame( frame ); +- lfrm->setFrameStyle( QFrame::Panel | QFrame::Sunken ); +- hbox->addWidget( lfrm, AlignCenter ); +- +- QLabel* icon = new QLabel( lfrm ); +- icon->setPixmap( UserIcon( "shutdownkonq" ) ); +- lfrm->setFixedSize( icon->sizeHint()); +- icon->setFixedSize( icon->sizeHint()); +- +- // right column (buttons) +- QVBoxLayout* buttonlay = new QVBoxLayout( hbox, 2 * KDialog::spacingHint() ); +- buttonlay->setAlignment( Qt::AlignHCenter ); +- +- buttonlay->addStretch( 1 ); +- +- // End session +- KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current Session"), "undo"), frame ); +- QFont btnFont = btnLogout->font(); +- buttonlay->addWidget( btnLogout ); +- connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout())); +- +- m_halCtx = NULL; +- +- if (maysd) { +- +- // Shutdown +- KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame ); +- btnHalt->setFont( btnFont ); +- buttonlay->addWidget( btnHalt ); +- connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt())); +- if ( sdtype == KApplication::ShutdownTypeHalt ) +- btnHalt->setFocus(); +- +- // Reboot +- KSMDelayedPushButton* btnReboot = new KSMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload"), frame ); +- btnReboot->setFont( btnFont ); +- buttonlay->addWidget( btnReboot ); +- +- connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot())); +- if ( sdtype == KApplication::ShutdownTypeReboot ) +- btnReboot->setFocus(); +- +- int def, cur; +- if ( DM().bootOptions( rebootOptions, def, cur ) ) { +- targets = new QPopupMenu( frame ); +- if ( cur == -1 ) +- cur = def; +- +- int index = 0; +- for (QStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) +- { +- QString label = (*it); +- label=label.replace('&',"&&"); +- if (index == cur) +- targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); +- else +- targets->insertItem( label, index ); +- } ++ // default factor ++ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); ++ ++ // slighty more space for the new logout ++ int factor = 2; + +- btnReboot->setPopup(targets); +- connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); ++ if(doUbuntuLogout) ++ { ++ factor = 8; + } ++ else { ++ QLabel* label = new QLabel( i18n("End Session for \"%1\"").arg(KUser().loginName()), frame ); ++ QFont fnt = label->font(); ++ fnt.setBold( true ); ++ fnt.setPointSize( fnt.pointSize() * 3 / 2 ); ++ label->setFont( fnt ); ++ vbox->addWidget( label, 0, AlignHCenter ); ++ } ++ ++ // for the basic layout, within this box either the ubuntu dialog or ++ // standard konqy+buttons will be placed. ++ QHBoxLayout* hbox = new QHBoxLayout( vbox, factor * KDialog::spacingHint() ); ++ ++ // from here on we have to adapt to the two different dialogs ++ QFrame* lfrm; ++ QVBoxLayout* buttonlay; ++ QHBoxLayout* hbuttonbox; ++ QFont btnFont; + +- // respect lock on resume & disable suspend/hibernate settings +- // from power-manager +- KConfig config("power-managerrc"); +- bool disableSuspend = config.readBoolEntry("disableSuspend", false); +- bool disableHibernate = config.readBoolEntry("disableHibernate", false); +- m_lockOnResume = config.readBoolEntry("lockOnResume", true); ++ if(doUbuntuLogout) ++ { ++ // first line of buttons ++ hbuttonbox = new QHBoxLayout( hbox, factor * KDialog::spacingHint() ); ++ hbuttonbox->setAlignment( Qt::AlignHCenter ); ++ // End session ++ FlatButton* btnLogout = new FlatButton( frame ); ++ btnLogout->setTextLabel( i18n("&Log out"), false ); ++ btnLogout->setPixmap( DesktopIcon( "back") ); ++ btnLogout->setAccel( ALT+Key_L ); ++ hbuttonbox->addWidget ( btnLogout ); ++ connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout())); + +- bool canSuspend = false; +- bool canHibernate = false; ++ } ++ else ++ { + +- // Query HAL for suspend/resume support +- m_halCtx = libhal_ctx_new(); ++ // konqy ++ lfrm = new QFrame( frame ); ++ lfrm->setFrameStyle( QFrame::Panel | QFrame::Sunken ); ++ hbox->addWidget( lfrm, AlignCenter ); ++ ++ buttonlay = new QVBoxLayout( hbox, factor * KDialog::spacingHint() ); ++ buttonlay->setAlignment( Qt::AlignHCenter ); ++ ++ QLabel* icon = new QLabel( lfrm ); ++ icon->setPixmap( UserIcon( "shutdownkonq" ) ); ++ lfrm->setFixedSize( icon->sizeHint()); ++ icon->setFixedSize( icon->sizeHint()); ++ ++ buttonlay->addStretch( 1 ); ++ // End session ++ KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current Session"), "undo"), frame ); ++ btnFont = btnLogout->font(); ++ buttonlay->addWidget( btnLogout ); ++ connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout())); ++ } + +- DBusError error; +- dbus_error_init(&error); +- m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- if (!m_dbusConn) +- { +- dbus_error_free(&error); +- libhal_ctx_free(m_halCtx); +- m_halCtx = NULL; +- } +- else +- { +- dbus_bus_register(m_dbusConn, &error); +- if (dbus_error_is_set(&error)) +- { +- dbus_error_free(&error); +- libhal_ctx_free(m_halCtx); +- m_dbusConn = NULL; +- m_halCtx = NULL; +- } +- else +- { +- libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn); +- if (!libhal_ctx_init(m_halCtx, &error)) +- { +- if (dbus_error_is_set(&error)) +- dbus_error_free(&error); +- libhal_ctx_free(m_halCtx); +- m_dbusConn = NULL; +- m_halCtx = NULL; +- } +- } +- } +- +- if (m_halCtx) +- { +- if (libhal_device_get_property_bool(m_halCtx, +- "/org/freedesktop/Hal/devices/computer", +- "power_management.can_suspend_to_ram", +- NULL)) +- { +- canSuspend = true; +- } +- +- if (libhal_device_get_property_bool(m_halCtx, +- "/org/freedesktop/Hal/devices/computer", +- "power_management.can_suspend_to_disk", +- NULL)) +- { +- canHibernate = true; +- } +- } +- +- if (canSuspend && !disableSuspend) +- { +- KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend Computer"), "suspend"), frame ); +- btnSuspend->setFont( btnFont ); +- buttonlay->addWidget( btnSuspend ); +- connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend())); +- } +- +- if (canHibernate && !disableHibernate) +- { +- KPushButton* btnHibernate = new KPushButton( KGuiItem( i18n("&Hibernate Computer"), "hibernate"), frame ); +- btnHibernate->setFont( btnFont ); +- buttonlay->addWidget( btnHibernate ); +- connect(btnHibernate, SIGNAL(clicked()), SLOT(slotHibernate())); +- } +- } ++ + +- buttonlay->addStretch( 1 ); ++ m_halCtx = NULL; + +- // Separator +- buttonlay->addWidget( new KSeparator( frame ) ); ++ if (maysd) { + +- // Back to Desktop +- KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame ); +- buttonlay->addWidget( btnBack ); +- connect(btnBack, SIGNAL(clicked()), SLOT(reject())); ++ // respect lock on resume & disable suspend/hibernate settings ++ // from power-manager ++ KConfig config("power-managerrc"); ++ bool disableSuspend = config.readBoolEntry("disableSuspend", false); ++ bool disableHibernate = config.readBoolEntry("disableHibernate", false); ++ m_lockOnResume = config.readBoolEntry("lockOnResume", true); ++ ++ bool canSuspend = false; ++ bool canHibernate = false; ++ ++ // Query HAL for suspend/resume support ++ m_halCtx = libhal_ctx_new(); ++ ++ DBusError error; ++ dbus_error_init(&error); ++ m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); ++ if (!m_dbusConn) ++ { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halCtx); ++ m_halCtx = NULL; ++ } ++ else ++ { ++ dbus_bus_register(m_dbusConn, &error); ++ if (dbus_error_is_set(&error)) ++ { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halCtx); ++ m_dbusConn = NULL; ++ m_halCtx = NULL; ++ } ++ else ++ { ++ libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn); ++ if (!libhal_ctx_init(m_halCtx, &error)) ++ { ++ if (dbus_error_is_set(&error)) ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halCtx); ++ m_dbusConn = NULL; ++ m_halCtx = NULL; ++ } ++ } ++ } ++ ++ if (m_halCtx) ++ { ++ if (libhal_device_get_property_bool(m_halCtx, ++ "/org/freedesktop/Hal/devices/computer", ++ "power_management.can_suspend_to_ram", ++ NULL)) ++ { ++ canSuspend = true; ++ } ++ ++ if (libhal_device_get_property_bool(m_halCtx, ++ "/org/freedesktop/Hal/devices/computer", ++ "power_management.can_suspend_to_disk", ++ NULL)) ++ { ++ canHibernate = true; ++ } ++ } ++ ++ ++ if(doUbuntuLogout) { ++ ++ if (canSuspend && !disableSuspend) ++ { ++ // Suspend ++ FlatButton* btnSuspend = new FlatButton( frame ); ++ btnSuspend->setTextLabel( i18n("&Suspend"), false ); ++ btnSuspend->setPixmap( DesktopIcon( "suspend") ); ++ btnSuspend->setAccel( ALT+Key_S ); ++ hbuttonbox->addWidget ( btnSuspend); ++ connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend())); ++ } ++ ++ if (canHibernate && !disableHibernate) ++ { ++ // Hibernate ++ FlatButton* btnHibernate = new FlatButton( frame ); ++ btnHibernate->setTextLabel( i18n("&Hibernate"), false ); ++ btnHibernate->setPixmap( DesktopIcon( "hibernate") ); ++ btnHibernate->setAccel( ALT+Key_H ); ++ hbuttonbox->addWidget ( btnHibernate); ++ connect(btnHibernate, SIGNAL(clicked()), SLOT(slotHibernate())); ++ } ++ ++ // Separator (within buttonlay) ++ vbox->addWidget( new KSeparator( frame ) ); ++ ++ // bottom buttons ++ QHBoxLayout* hbuttonbox2 = new QHBoxLayout( vbox, factor * KDialog::spacingHint() ); ++ hbuttonbox2->setAlignment( Qt::AlignHCenter ); ++ ++ // Reboot ++ FlatButton* btnReboot = new FlatButton( frame ); ++ btnReboot->setTextLabel( i18n("&Restart"), false ); ++ btnReboot->setPixmap( DesktopIcon( "reload") ); ++ btnReboot->setAccel( ALT+Key_R ); ++ hbuttonbox2->addWidget ( btnReboot); ++ connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot())); ++ if ( sdtype == KApplication::ShutdownTypeReboot ) ++ btnReboot->setFocus(); ++ ++ // BAD CARMA .. this code is copied line by line from standard konqy dialog ++ int def, cur; ++ if ( DM().bootOptions( rebootOptions, def, cur ) ) { ++ btnReboot->setPopupDelay(300); // visually add dropdown ++ targets = new QPopupMenu( frame ); ++ if ( cur == -1 ) ++ cur = def; ++ ++ int index = 0; ++ for (QStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) ++ { ++ QString label = (*it); ++ label=label.replace('&',"&&"); ++ if (index == cur) ++ targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); ++ else ++ targets->insertItem( label, index ); ++ } ++ ++ btnReboot->setPopup(targets); ++ connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); ++ } ++ // BAD CARMA .. this code is copied line by line from standard konqy dialog [EOF] ++ ++ // Shutdown ++ FlatButton* btnHalt = new FlatButton( frame ); ++ btnHalt->setTextLabel( i18n("&Turn Off"), false ); ++ btnHalt->setPixmap( DesktopIcon( "exit") ); ++ btnHalt->setAccel( ALT+Key_T ); ++ hbuttonbox2->addWidget ( btnHalt ); ++ connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt())); ++ if ( sdtype == KApplication::ShutdownTypeHalt ) ++ btnHalt->setFocus(); ++ ++ // cancel buttonbox ++ QHBoxLayout* hbuttonbox3 = new QHBoxLayout( vbox, factor * KDialog::spacingHint() ); ++ hbuttonbox3->setAlignment( Qt::AlignRight ); ++ ++ // Back to Desktop ++ KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); ++ hbuttonbox3->addWidget( btnBack ); ++ connect(btnBack, SIGNAL(clicked()), SLOT(reject())); ++ ++ } ++ else ++ { ++ // Shutdown ++ KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame ); ++ btnHalt->setFont( btnFont ); ++ buttonlay->addWidget( btnHalt ); ++ connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt())); ++ if ( sdtype == KApplication::ShutdownTypeHalt ) ++ btnHalt->setFocus(); ++ ++ // Reboot ++ KSMDelayedPushButton* btnReboot = new KSMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload"), frame ); ++ btnReboot->setFont( btnFont ); ++ buttonlay->addWidget( btnReboot ); ++ ++// connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot())); ++ if ( sdtype == KApplication::ShutdownTypeReboot ) ++ btnReboot->setFocus(); ++ ++ // this section is copied as-is into ubuntulogout as well ++ int def, cur; ++ if ( DM().bootOptions( rebootOptions, def, cur ) ) { ++ targets = new QPopupMenu( frame ); ++ if ( cur == -1 ) ++ cur = def; ++ ++ int index = 0; ++ for (QStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) ++ { ++ QString label = (*it); ++ label=label.replace('&',"&&"); ++ if (index == cur) ++ targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); ++ else ++ targets->insertItem( label, index ); ++ } ++ ++ btnReboot->setPopup(targets); ++ connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); ++ } ++ ++ ++ if (canSuspend && !disableSuspend) ++ { ++ KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend Computer"), "suspend"), frame ); ++ btnSuspend->setFont( btnFont ); ++ buttonlay->addWidget( btnSuspend ); ++ connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend())); ++ } ++ ++ if (canHibernate && !disableHibernate) ++ { ++ KPushButton* btnHibernate = new KPushButton( KGuiItem( i18n("&Hibernate Computer"), "hibernate"), frame ); ++ btnHibernate->setFont( btnFont ); ++ buttonlay->addWidget( btnHibernate ); ++ connect(btnHibernate, SIGNAL(clicked()), SLOT(slotHibernate())); ++ } ++ ++ buttonlay->addStretch( 1 ); ++ ++ // Separator ++ buttonlay->addWidget( new KSeparator( frame ) ); ++ ++ // Back to Desktop ++ KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame ); ++ buttonlay->addWidget( btnBack ); ++ connect(btnBack, SIGNAL(clicked()), SLOT(reject())); ++ ++ } ++ ++ } + + } + ++ + KSMShutdownDlg::~KSMShutdownDlg() + { + if (m_halCtx) +@@ -574,3 +721,132 @@ + popt->stop(); + setDown(false); + } ++ ++KSMPushButton::KSMPushButton( const KGuiItem &item, ++ QWidget *parent, ++ const char *name) ++ : KPushButton( item, parent, name), ++ m_pressed(false) ++{ ++ setDefault( false ); ++ setAutoDefault ( false ); ++} ++ ++ ++void KSMPushButton::keyPressEvent( QKeyEvent* e ) ++{ ++switch ( e->key() ) ++ { ++ case Key_Enter: ++ case Key_Return: ++ case Key_Space: ++ m_pressed = TRUE; ++ setDown(true); ++ emit pressed(); ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ } ++ ++ QPushButton::keyPressEvent(e); ++} ++ ++ ++void KSMPushButton::keyReleaseEvent( QKeyEvent* e ) ++{ ++ switch ( e->key() ) ++ { ++ case Key_Space: ++ case Key_Enter: ++ case Key_Return: ++ if ( m_pressed ) ++ { ++ setDown(false); ++ m_pressed = FALSE; ++ emit released(); ++ emit clicked(); ++ } ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ } ++ ++} ++ ++ ++ ++ ++FlatButton::FlatButton( QWidget *parent, const char *name ) ++ : QToolButton( parent, name/*, WNoAutoErase*/ ), ++ m_pressed(false) ++{ ++ init(); ++} ++ ++ ++FlatButton::~FlatButton() {} ++ ++ ++void FlatButton::init() ++{ ++ setUsesTextLabel(true); ++ setUsesBigPixmap(true); ++ setAutoRaise(true); ++ setTextPosition( QToolButton::Under ); ++ setFocusPolicy(QWidget::StrongFocus); ++ } ++ ++ ++void FlatButton::keyPressEvent( QKeyEvent* e ) ++{ ++ switch ( e->key() ) ++ { ++ case Key_Enter: ++ case Key_Return: ++ case Key_Space: ++ m_pressed = TRUE; ++ setDown(true); ++ emit pressed(); ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ } ++ ++ QToolButton::keyPressEvent(e); ++} ++ ++ ++void FlatButton::keyReleaseEvent( QKeyEvent* e ) ++{ ++ switch ( e->key() ) ++ { ++ case Key_Space: ++ case Key_Enter: ++ case Key_Return: ++ if ( m_pressed ) ++ { ++ setDown(false); ++ m_pressed = FALSE; ++ emit released(); ++ emit clicked(); ++ } ++ break; ++ case Key_Escape: ++ e->ignore(); ++ break; ++ default: ++ e->ignore(); ++ } ++ ++} ++ ++ +diff -Nur kdebase-3.5.6/ksmserver/shutdowndlg.h kdebase-3.5.6.new/ksmserver/shutdowndlg.h +--- kdebase-3.5.6/ksmserver/shutdowndlg.h 2007-03-05 10:36:21.000000000 +0000 ++++ kdebase-3.5.6.new/ksmserver/shutdowndlg.h 2007-03-05 10:38:35.000000000 +0000 +@@ -12,10 +12,19 @@ + #include + #include + #include ++#include ++#include ++#include ++#include ++ + class QPushButton; + class QVButtonGroup; + class QPopupMenu; + class QTimer; ++class QPainter; ++class QString; ++class KAction; ++ + + #include + #include +@@ -108,4 +117,51 @@ + QTimer *popt; + }; + ++class KSMPushButton : public KPushButton ++{ ++ Q_OBJECT ++ ++public: ++ ++ KSMPushButton( const KGuiItem &item, QWidget *parent, const char *name = 0 ); ++ ++protected: ++ virtual void keyPressEvent(QKeyEvent*e); ++ virtual void keyReleaseEvent(QKeyEvent*e); ++ ++private: ++ ++ bool m_pressed; ++ ++}; ++ ++ ++ ++class FlatButton : public QToolButton ++{ ++ Q_OBJECT ++ ++ public: ++ ++ FlatButton( QWidget *parent = 0, const char *name = 0 ); ++ ~FlatButton(); ++ ++ protected: ++ virtual void keyPressEvent(QKeyEvent*e); ++ virtual void keyReleaseEvent(QKeyEvent*e); ++ ++ private slots: ++ ++ private: ++ void init(); ++ ++ bool m_pressed; ++ QString m_text; ++ QPixmap m_pixmap; ++ ++}; ++ ++ ++ ++ + #endif --- kdebase-3.5.6.orig/debian/patches/19_kcontrol_only_in_kde.diff +++ kdebase-3.5.6/debian/patches/19_kcontrol_only_in_kde.diff @@ -0,0 +1,14 @@ +--- kde.orig/kcontrol/kcontrol/KControl.desktop ++++ kde.patched/kcontrol/kcontrol/KControl.desktop +@@ -86,3 +86,4 @@ + + X-DCOP-ServiceType=Unique + Categories=Qt;KDE;Core; ++OnlyShowIn=KDE; +--- kde.orig/kcontrol/kcontrol/kinfocenter.desktop ++++ kde.patched/kcontrol/kcontrol/kinfocenter.desktop +@@ -82,3 +82,4 @@ + + X-DCOP-ServiceType=Unique + Categories=Qt;KDE;System; ++OnlyShowIn=KDE; --- kdebase-3.5.6.orig/debian/patches/22_default_backgrounds.diff +++ kdebase-3.5.6/debian/patches/22_default_backgrounds.diff @@ -0,0 +1,39 @@ +--- kde.orig/kdm/kfrontend/genkdmconf.c ++++ kde.patched/kdm/kfrontend/genkdmconf.c +@@ -658,7 +658,7 @@ + "Program=\n" + "ReverseBlending=false\n" + "UseSHM=false\n" +-"Wallpaper=default_blue.jpg\n" ++"Wallpaper=debian-kde_default.png\n" + "WallpaperList=\n" + "WallpaperMode=Scaled\n"; + +--- kde.orig/kpersonalizer/keyecandypage.cpp ++++ kde.patched/kpersonalizer/keyecandypage.cpp +@@ -240,14 +240,14 @@ + kdesktopconf->setGroup("Desktop0"); + + if( st_UserWallpaper.WallpaperMode == "NoWallpaper") +- deskbgimage="KDE34.png"; ++ deskbgimage="debian-kde_default.png"; + + if(enable && !user){ + // if the user has a different mode than the default of NoMulti, we don't change anyting on that. + if( st_UserWallpaper.MultiWallpaperMode == "NoMulti" ) + kdesktopconf->writeEntry("MultiWallpaperMode", "NoMulti"); + // if the wallpaper is the new default one, set mode to scaled to leave user settings untouched +- if( deskbgimage == "KDE34.png"){ ++ if( deskbgimage == "debian-kde_default.png"){ + kdesktopconf->writeEntry("WallpaperMode", "Scaled"); + //here we change the kdesktop font color to white as it fits better + // to the KDE34png.png gray background +@@ -689,7 +689,7 @@ + st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti"); + st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled"); + st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper"); +- deskbgimage = kdesktopconf->readPathEntry("Wallpaper", "KDE34.png"); ++ deskbgimage = kdesktopconf->readPathEntry("Wallpaper", "debian-kde_default.png"); + // Wallpaper-User-Defaults (END) + + KGlobal::config()->setGroup("KDE"); --- kdebase-3.5.6.orig/debian/kmenuedit.install +++ kdebase-3.5.6/debian/kmenuedit.install @@ -0,0 +1,38 @@ +debian/tmp/usr/bin/kcontroledit +debian/tmp/usr/bin/kmenuedit +debian/tmp/usr/lib/kde3/kcontroledit.la +debian/tmp/usr/lib/kde3/kcontroledit.so +debian/tmp/usr/lib/kde3/kmenuedit.la +debian/tmp/usr/lib/kde3/kmenuedit.so +debian/tmp/usr/lib/libkdeinit_kcontroledit.so +debian/tmp/usr/lib/libkdeinit_kmenuedit.so +debian/tmp/usr/share/applications/kde/kmenuedit.desktop +debian/tmp/usr/share/applnk/System/kmenuedit.desktop +debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +debian/tmp/usr/share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +debian/tmp/usr/share/apps/kcontroledit/kcontroleditui.rc +debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png +debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png +debian/tmp/usr/share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png +debian/tmp/usr/share/apps/kmenuedit/kmenueditui.rc +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/common +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/done.png +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/itemname.png +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/kmenueditmain.png +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/new.png +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/selecticon.png +debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/selectinternet.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kmenuedit.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kmenuedit.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kmenuedit.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kmenuedit.png + +debian/icons/kmenuedit.xpm /usr/share/pixmaps +debian/icons/kmenuedit-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/ktip.menu +++ kdebase-3.5.6/debian/ktip.menu @@ -0,0 +1,11 @@ +?package(ktip):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="KTip"\ + icon32x32="/usr/share/pixmaps/ktip.xpm"\ + icon16x16="/usr/share/pixmaps/ktip-16.xpm"\ + command="/usr/bin/ktip" + +# Icon 32x32 ktip/cr32-app-ktip.png ktip.xpm +# Icon 16x16 ktip/cr16-app-ktip.png ktip-16.xpm --- kdebase-3.5.6.orig/debian/konqueror.menu +++ kdebase-3.5.6/debian/konqueror.menu @@ -0,0 +1,35 @@ +?package(konqueror):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KEditBookmarks"\ + icon32x32="/usr/share/pixmaps/keditbookmarks.xpm"\ + icon16x16="/usr/share/pixmaps/keditbookmarks-16.xpm"\ + command="/usr/bin/keditbookmarks" + +?package(konqueror):\ + needs="X11"\ + section="Apps/Net"\ + hints="KDE,Web browsers"\ + title="Konqueror"\ + icon32x32="/usr/share/pixmaps/konqueror.xpm"\ + icon16x16="/usr/share/pixmaps/konqueror-16.xpm"\ + command="/usr/bin/konqueror --profile webbrowsing" + +?package(konqueror):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE,File managers"\ + title="Konqueror"\ + icon32x32="/usr/share/pixmaps/kfm.xpm"\ + icon16x16="/usr/share/pixmaps/kfm-16.xpm"\ + command="/usr/bin/konqueror --profile filemanagement" + +# Icon 32x32 konqueror/keditbookmarks/cr32-app-keditbookmarks.png keditbookmarks.xpm +# Icon 16x16 konqueror/keditbookmarks/cr16-app-keditbookmarks.png keditbookmarks-16.xpm + +# Icon 32x32 konqueror/pics/cr32-app-konqueror.png konqueror.xpm +# Icon 16x16 konqueror/pics/cr16-app-konqueror.png konqueror-16.xpm + +# Icon 32x32 konqueror/pics/cr32-app-kfm.png kfm.xpm +# Icon 16x16 konqueror/pics/cr16-app-kfm.png kfm-16.xpm --- kdebase-3.5.6.orig/debian/konsole.preinst +++ kdebase-3.5.6/debian/konsole.preinst @@ -0,0 +1,24 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/kde3/konsolerc + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/ksmserver.prerm +++ kdebase-3.5.6/debian/ksmserver.prerm @@ -0,0 +1,44 @@ +#! /bin/sh +# prerm script for ksmserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/startkde + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- kdebase-3.5.6.orig/debian/edit-as-root.desktop +++ kdebase-3.5.6/debian/edit-as-root.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +ServiceTypes=text/*,application/x-desktop +Actions=Editassu + +[Desktop Action Editassu] +Name=Edit as Root +Name[it]=Edita come Root +Name[fr]=Editer en tant que Root +Name[es]=Editar como Root +Name[de]=Als root bearbeiten +Icon=kfm +Exec=kdesu "kwrite" "%U" --- kdebase-3.5.6.orig/debian/kdm.preinst +++ kdebase-3.5.6/debian/kdm.preinst @@ -0,0 +1,29 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/kde3/debian/kdm-update-menu.sh + rm -f /etc/kde3/debian/kdm.options + rm -f /etc/kde3/kdm/pixmaps/XFree86bw.xpm + rm -f /etc/kde3/kdm/pixmaps/XFree86.xpm + rm -f /etc/kde3/kdm/Xresources + rm -f /etc/menu-methods/kdm + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/source.lintian-overrides +++ kdebase-3.5.6/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +kdebase source: maintainer-script-lacks-debhelper-token debian/kdm.postinst +kdebase source: maintainer-script-lacks-debhelper-token debian/kdm.prerm --- kdebase-3.5.6.orig/debian/kdm.templates +++ kdebase-3.5.6/debian/kdm.templates @@ -0,0 +1,31 @@ +Template: shared/default-x-display-manager +Type: select +Choices: ${choices} +_Description: Select the desired default display manager. + A display manager is a program that provides graphical login capabilities for + the X Window System. + . + Only one display manager can manage a given X server, but multiple display + manager packages are installed. Please select which display manager should + run by default. + . + (Multiple display managers can run simultaneously if they are configured to + manage different servers; to achieve this, configure the display managers + accordingly, edit each of their init scripts in /etc/init.d, and disable the + check for a default display manager.) + +Template: kdm/daemon_name +Type: string +Default: /usr/bin/kdm +Description: internal use only + This template is never shown to the user and does not require translation. + +Template: kdm/stop_running_server_with_children +Type: boolean +Default: false +_Description: Do you wish to stop the kdm daemon? + The K Desktop manager (kdm) daemon is typically stopped on package upgrade + and removal, but it appears to be managing at least one running X session. + If kdm is stopped now, any X sessions it manages will be terminated. + Otherwise you may leave kdm running, and the new version will take effect the + next time the daemon is restarted. --- kdebase-3.5.6.orig/debian/kate.manpages +++ kdebase-3.5.6/debian/kate.manpages @@ -0,0 +1,2 @@ +debian/man/kate.1 +debian/man/kwrite.1 --- kdebase-3.5.6.orig/debian/kfind.install +++ kdebase-3.5.6/debian/kfind.install @@ -0,0 +1,25 @@ +debian/tmp/usr/bin/kfind +debian/tmp/usr/lib/kde3/libkfindpart.la +debian/tmp/usr/lib/kde3/libkfindpart.so +debian/tmp/usr/share/applications/kde/Kfind.desktop +debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/archive.png +debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/delete.png +debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/idea.png +debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/info.png +debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png +debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/save.png +debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/search.png +debian/tmp/usr/share/doc/kde/HTML/en/kfind/common +debian/tmp/usr/share/doc/kde/HTML/en/kfind/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kfind/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kfind/man-kfind.1.docbook +debian/tmp/usr/share/icons/hicolor/16x16/apps/kfind.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kfind.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kfind.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kfind.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kfind.png +debian/tmp/usr/share/services/kfindpart.desktop +debian/tmp/usr/share/servicetypes/findpart.desktop + +debian/icons/kfind.xpm /usr/share/pixmaps +debian/icons/kfind-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/konsole.lintian +++ kdebase-3.5.6/debian/konsole.lintian @@ -0,0 +1,3 @@ +konsole: no-shlibs-control-file usr/lib/libkdeinit_konsole.so +konsole: postinst-must-call-ldconfig usr/lib/libkdeinit_konsole.so +konsole: postrm-should-call-ldconfig usr/lib/libkdeinit_konsole.so --- kdebase-3.5.6.orig/debian/kpersonalizer.install +++ kdebase-3.5.6/debian/kpersonalizer.install @@ -0,0 +1,13 @@ +debian/tmp/usr/bin/kpersonalizer +debian/tmp/usr/share/applications/kde/kpersonalizer.desktop +debian/tmp/usr/share/applnk/System/kpersonalizer.desktop +debian/tmp/usr/share/apps/kpersonalizer/pics/step1.png +debian/tmp/usr/share/apps/kpersonalizer/pics/step2.png +debian/tmp/usr/share/apps/kpersonalizer/pics/step3.png +debian/tmp/usr/share/apps/kpersonalizer/pics/step4.png +debian/tmp/usr/share/apps/kpersonalizer/pics/step5.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpersonalizer.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpersonalizer.png + +debian/icons/kpersonalizer.xpm /usr/share/pixmaps +debian/icons/kpersonalizer-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kdebase-bin.menu +++ kdebase-3.5.6/debian/kdebase-bin.menu @@ -0,0 +1,13 @@ +?package(kdebase-bin):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KDebugDialog"\ + command="/usr/bin/kdebugdialog" + +?package(kdebase-bin):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KDCOP"\ + command="/usr/bin/kdcop" --- kdebase-3.5.6.orig/debian/local/kdm.options +++ kdebase-3.5.6/debian/local/kdm.options @@ -0,0 +1,8 @@ +# /etc/kde3/kdm/kdm.options +# +# configuration options for kdm +# See kdm.options(5) for an explanation of the available options. + +no-ignore-nologin +no-restart-on-upgrade +use-sessreg --- kdebase-3.5.6.orig/debian/local/kdm.options.5 +++ kdebase-3.5.6/debian/local/kdm.options.5 @@ -0,0 +1,87 @@ +.\" $Id: kdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ +.\" +.\" Copyright 1998, 2002, 2003 Branden Robinson . +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; version 2. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.TH kdm.options 5 "2003\-09\-18" "Debian Project" +.SH NAME +kdm.options \- configuration options for X display manager +.SH DESCRIPTION +.I /etc/kde3/kdm/kdm.options +contains a set of flags that determine some of the behavior of the +X display manager +.BR kdm (1). +.PP +.I /etc/kde3/kdm/kdm.options +may contain comments, which begin with a hash mark and end at the next +newline, just like comments in shell scripts. The rest of the file +consists of options which are expressed as words separated by hyphens, with +only one option per line. If an option is present with the \(oqno\-\(cq +prefix, or absent, it is disabled, otherwise it is considered enabled. +.PP +Available options are: +.TP +.B ignore\-nologin +Normally, the contents of the /etc/nologin file will be displayed using +.BR xmessage (1x) +(if +.B xmessage +is available), and the user will be returned to the kdm login screen after +the xmessage is dismissed. If this option is enabled, kdm starts a session +as usual (after the xmessage is dismissed, if xmessage is available). +.TP +.B restart\-on\-upgrade +Enable this option with caution on \(oqproduction\(cq machines; it causes +the kdm daemon to be stopped and restarted on upgrade, even if the process +has children (which means it is managing X sessions). Typically when a +package that contains a daemon is being installed or upgraded, its +maintainer scripts stop a running daemon process before installing the new +binary, and restart it after the new binary is installed. Stopping kdm +causes immediate termination of any sessions it manages; in some situations +this could be an unwelcome surprise (for instance, for remote kdm users who +had no idea the administrator was performing system maintenance). On the +other hand, for machines that stay up for long periods of time, leaving the +old daemon running can be a bad idea if the new version has, for instance, +a fix for a security vulnerability (overwriting kdm's executable on the +file system has no effect on the copy of kdm in memory). The kdm +pre\-removal script checks to see if the kdm process has any children; if +it does, it is possible that someone's session would be killed by stopping +kdm, so a warning is issued and an opportunity to abort the upgrade of kdm +is provided. If this option is disabled (the Debian default), kdm will be +not be stopped or started during an install or upgrade; the administrator +will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by +rebooting the system) before the newly installed kdm binary is used. +.TP +.B use\-sessreg +If this option is enabled (the Debian default), the sessreg program will be +invoked to register X sessions managed by kdm in the utmp and wtmp files. +Otherwise, it is not, and the utmp and wtmp files will have no record of +kdm sessions. +.PP +Users of older versions of the Debian system should note that the +\(oqrun\-xconsole\(cq option has been removed. Shell scripts named +.I /etc/kde3/kdm/Xsetup +and +.I /etc/kde3/kdm/Xreset +can be edited to disable or modify the running of xconsole on the kdm +greeter screen; see the +.B kdm +manual page for more information. +.SH AUTHOR +This manpage was written by Branden Robinson for the Debian Project. +.SH SEE ALSO +.BR sessreg (1x), +.BR xmessage (1x), +.BR kdm (1x) --- kdebase-3.5.6.orig/debian/kdebase-kio-plugins.README.Debian +++ kdebase-3.5.6/debian/kdebase-kio-plugins.README.Debian @@ -0,0 +1,16 @@ +KDE and media kioslave support +============================== + +The media kioslave, new in KDE 3.4, supports the automatic mounting of +removable devices, such as CD-ROM and DVD drives, USB pen drives, digital +cameras, and many other types of equipment. + +While some functionality is available without the use of HAL, media works +best with HAL (and therefore udev), in combination with pmount. Media +also extends the functionality of many other kioslaves. Check which +packages are recommended by the kdebase-kio-plugins package, and install +accordingly. + +Note that for regular users to use media in conjunction with HAL, they must +be members of the plugdev group. (permanently, not through +/etc/security/group.conf). --- kdebase-3.5.6.orig/debian/konsole.manpages +++ kdebase-3.5.6/debian/konsole.manpages @@ -0,0 +1 @@ +debian/man/konsole.1 --- kdebase-3.5.6.orig/debian/konsole.menu +++ kdebase-3.5.6/debian/konsole.menu @@ -0,0 +1,11 @@ +?package(konsole):\ + needs="X11"\ + section="XShells"\ + hints="KDE"\ + title="Konsole"\ + icon32x32="/usr/share/pixmaps/konsole.xpm"\ + icon16x16="/usr/share/pixmaps/konsole-16.xpm"\ + command="/usr/bin/konsole" + +# Icon 32x32 konsole/other/cr32-app-konsole.png konsole.xpm +# Icon 16x16 konsole/other/cr16-app-konsole.png konsole-16.xpm --- kdebase-3.5.6.orig/debian/prune-nonfree +++ kdebase-3.5.6/debian/prune-nonfree @@ -0,0 +1,30 @@ +#!/bin/sh -e + +# Removes non-free files from the source tree. Must be done before +# creating the orig.tar.gz. + +TOPLEVEL="$1" + +if [ "$TOPLEVEL" = "" ]; then + echo "Please provide the toplevel directory as the argument." + exit 1 +else + rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-firefox.png + rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-firefox.png + rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-firefox.png + rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-thunderbird.png + rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-thunderbird.png + rm -f $TOPLEVEL/pics/crystalsvg/cr128-app-mozilla.png + rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-mozilla_mail.png + rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-mozilla_m.png + rm -f $TOPLEVEL/pics/crystalsvg/cr16-app-mozilla.png + rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-mozilla_mail.png + rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-mozilla_m.png + rm -f $TOPLEVEL/pics/crystalsvg/cr32-app-mozilla.png + rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-mozilla_mail.png + rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-mozilla_m.png + rm -f $TOPLEVEL/pics/crystalsvg/cr48-app-mozilla.png + rm -f $TOPLEVEL/pics/crystalsvg/cr64-app-mozilla.png +fi + +exit 0 --- kdebase-3.5.6.orig/debian/kate.install +++ kdebase-3.5.6/debian/kate.install @@ -0,0 +1,80 @@ +debian/tmp/etc/kde3/katerc +debian/tmp/usr/bin/kate +debian/tmp/usr/bin/kwrite +debian/tmp/usr/lib/kde3/kate.la +debian/tmp/usr/lib/kde3/kate.so +debian/tmp/usr/lib/kde3/kwrite.la +debian/tmp/usr/lib/kde3/kwrite.so +debian/tmp/usr/lib/libkateinterfaces.so.0 +debian/tmp/usr/lib/libkateinterfaces.so.0.0.0 +debian/tmp/usr/lib/libkateutils.so.0 +debian/tmp/usr/lib/libkateutils.so.0.0.0 +debian/tmp/usr/lib/libkdeinit_kate.so +debian/tmp/usr/lib/libkdeinit_kwrite.so +debian/tmp/usr/share/applications/kde/kate.desktop +debian/tmp/usr/share/applications/kde/kwrite.desktop +debian/tmp/usr/share/apps/kate/externaltools +debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png +debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png +debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modified.png +debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modmod.png +debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modonhd.png +debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/null.png +debian/tmp/usr/share/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png +debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/curfiledir.png +debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/indent.png +debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modified.png +debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modmod.png +debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modonhd.png +debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/null.png +debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/unindent.png +debian/tmp/usr/share/apps/kate/icons/locolor/22x22/actions/indent.png +debian/tmp/usr/share/apps/kate/icons/locolor/22x22/actions/unindent.png +debian/tmp/usr/share/apps/kate/kateui.rc +debian/tmp/usr/share/apps/kate/pics/sessionchooser.png +debian/tmp/usr/share/apps/kate/tips +debian/tmp/usr/share/apps/kconf_update/kate-2.4.upd +debian/tmp/usr/share/apps/kwrite/kwriteui.rc +debian/tmp/usr/share/doc/kde/HTML/en/kate/advanced.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/common +debian/tmp/usr/share/doc/kde/HTML/en/kate/configdialog01.png +debian/tmp/usr/share/doc/kde/HTML/en/kate/configdialog02.png +debian/tmp/usr/share/doc/kde/HTML/en/kate/configuring.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/fundamentals.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/highlighted.png +debian/tmp/usr/share/doc/kde/HTML/en/kate/highlighting.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kate/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/kate.png +debian/tmp/usr/share/doc/kde/HTML/en/kate/man-kate.1.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/mdi.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/menus.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/mimetypechooser.png +debian/tmp/usr/share/doc/kde/HTML/en/kate/part.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/plugins.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/regular-expressions.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kate/TODO +debian/tmp/usr/share/doc/kde/HTML/en/kate/unhighlighted.png +debian/tmp/usr/share/doc/kde/HTML/en/kwrite/common +debian/tmp/usr/share/doc/kde/HTML/en/kwrite/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kwrite/index.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/kate.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/kwrite.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kate.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kwrite.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kate.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kwrite.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kate.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kwrite.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kate.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kwrite.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kate.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kwrite.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/kate2.svgz +debian/tmp/usr/share/icons/hicolor/scalable/apps/kwrite2.svgz +debian/tmp/usr/share/servicetypes/kateplugin.desktop + +debian/icons/kate-16.xpm /usr/share/pixmaps +debian/icons/kate.xpm /usr/share/pixmaps +debian/icons/kwrite-16.xpm /usr/share/pixmaps +debian/icons/kwrite.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kappfinder.manpages +++ kdebase-3.5.6/debian/kappfinder.manpages @@ -0,0 +1 @@ +debian/man/kappfinder.1 --- kdebase-3.5.6.orig/debian/kdeprint.lintian +++ kdebase-3.5.6/debian/kdeprint.lintian @@ -0,0 +1,4 @@ +kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kjobviewer.so +kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kprinter.so +kdeprint: postinst-must-call-ldconfig usr/lib/libkdeinit_kjobviewer.so +kdeprint: postrm-should-call-ldconfig usr/lib/libkdeinit_kjobviewer.so --- kdebase-3.5.6.orig/debian/khelpcenter.install +++ kdebase-3.5.6/debian/khelpcenter.install @@ -0,0 +1,220 @@ +debian/tmp/usr/bin/khc_docbookdig.pl +debian/tmp/usr/bin/khc_htdig.pl +debian/tmp/usr/bin/khc_htsearch.pl +debian/tmp/usr/bin/khc_indexbuilder +debian/tmp/usr/bin/khc_mansearch.pl +debian/tmp/usr/bin/khelpcenter +debian/tmp/usr/lib/kde3/khelpcenter.la +debian/tmp/usr/lib/kde3/khelpcenter.so +debian/tmp/usr/lib/libkdeinit_khelpcenter.so +debian/tmp/usr/share/applications/kde/Help.desktop +debian/tmp/usr/share/apps/khelpcenter/glossary.html.in +debian/tmp/usr/share/apps/khelpcenter/glossary.xslt +debian/tmp/usr/share/apps/khelpcenter/index.html.in +debian/tmp/usr/share/apps/khelpcenter/intro.html.in +debian/tmp/usr/share/apps/khelpcenter/khelpcenterui.rc +debian/tmp/usr/share/apps/khelpcenter/plugins/applets.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Applications/.directory +debian/tmp/usr/share/apps/khelpcenter/plugins/contact.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/faq.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/info.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/kcontrolmodules.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/kicmodules.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/kioslaves.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/konqplugins.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/links.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/.directory +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man1.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man2.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man3.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man4.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man5.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man6.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man7.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man8.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man9.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/mann.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Scrollkeeper/.directory +debian/tmp/usr/share/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/support.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Tutorials/.directory +debian/tmp/usr/share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/Tutorials/visualdict.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/userguide.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/welcome.desktop +debian/tmp/usr/share/apps/khelpcenter/searchhandlers/docbook.desktop +debian/tmp/usr/share/apps/khelpcenter/searchhandlers/htdig.desktop +debian/tmp/usr/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html +debian/tmp/usr/share/apps/khelpcenter/searchhandlers/man.desktop +debian/tmp/usr/share/apps/khelpcenter/table-of-contents.xslt +debian/tmp/usr/share/config.kcfg/khelpcenter.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/background.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/bgtable.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/common +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/contact.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/about.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/common +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/configkde.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/contrib.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/desktop.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/filemng.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/getkde.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/install.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/intro.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/kdeapps.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/misc.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/moreinfo.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/nonkdeapps.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/notrelated.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/panel.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/qt.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/questions.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/sound.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/tips.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/TODO +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/webbrowse.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/winmng.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/common +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/help.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/kdelogo2.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/khelpcenter.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/konq.css +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/lines2.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/lines.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/pointers.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/quickstart/common +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/quickstart/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/quickstart/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/shadow1.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/support.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/accessibility.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/amarok-icon.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/amarok.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/a-window.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/base-kde-applications.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/burning-cds.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/common +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/control-center.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/creating-graphics.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/credits-and-license.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/desktop.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/email.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/extragear-applications.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/file-sharing.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/font-installation.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/getting-help.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/glossary.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/juk-icon.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/juk.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle-icon.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kcalc-systray.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kcontrol.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-as-root.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-edutainment.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-for-admins.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-office.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmag.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmousetool.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth2.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth3.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-identity.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-mail-account.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-news-account.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-start.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/konq-sidebar.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/konq-simple.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/konsole-intro.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kopete.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kppp-wizard.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/messaging-intro.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/migrator-applications.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/net-connection-setup.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/networking-with-windows.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/noatun-icon.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/noatun.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/oggfolder.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/open-file-dialog.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/pdf-files.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/playing-audiocds.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/playing-movies.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/playing-music.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/printer-setup.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/printing-from-apps.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/programs-and-documents.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/programs-controlling.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/removable-disks.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/rip.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/ripsettings.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/screen-captures.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/services.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/shared-sessions.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/switching-sessions.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/the-filemanager.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/titlebar-menu.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/under-the-hood.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/usenet.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/where-next.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/windows-how-to.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/your-kde-account.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/common +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict10.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict11.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict12.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict13.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict14.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict15.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict16.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict17.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict18.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict19.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict1.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict20.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict2.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict3.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict4.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict5.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict6.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/welcome.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/whatiskde.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/khelpcenter.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/khelpcenter.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/khelpcenter.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/khelpcenter.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/khelpcenter.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/khelpcenter.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/khelpcenter.svgz +debian/tmp/usr/share/services/khelpcenter.desktop +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/splash-screen.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/customizing-desktop.docbook +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict21.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict22.png +debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict23.png + +debian/icons/khelpcenter.xpm /usr/share/pixmaps +debian/icons/khelpcenter-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/klipper.menu +++ kdebase-3.5.6/debian/klipper.menu @@ -0,0 +1,11 @@ +?package(klipper):\ + needs="X11"\ + section="Apps/Tools"\ + hints="KDE"\ + title="Klipper"\ + icon32x32="/usr/share/pixmaps/klipper.xpm"\ + icon16x16="/usr/share/pixmaps/klipper-16.xpm"\ + command="/usr/bin/klipper" + +# Icon 32x32 klipper/cr32-app-klipper.png klipper.xpm +# Icon 16x16 klipper/cr16-app-klipper.png klipper-16.xpm --- kdebase-3.5.6.orig/debian/ksmserver.preinst +++ kdebase-3.5.6/debian/ksmserver.preinst @@ -0,0 +1,27 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/gdm/Sessions/KDE + rm -f /etc/kde3/debian/startkde + /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2 + /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde3 + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/kwin.prerm +++ kdebase-3.5.6/debian/kwin.prerm @@ -0,0 +1,44 @@ +#! /bin/sh +# prerm script for konqueror +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + /usr/sbin/update-alternatives --remove x-window-manager /usr/bin/kwin + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.kfind +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.kfind @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-kfind +Title: KFind Handbook +Author: Dirk Doerflinger +Abstract: This Handbook describes KFind, KDE's file find utility. +Section: Apps/Utils + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kfind/index.html +Files: /usr/share/doc/kde/HTML/en/kfind/*.html + --- kdebase-3.5.6.orig/debian/kpager.install +++ kdebase-3.5.6/debian/kpager.install @@ -0,0 +1,15 @@ +debian/tmp/usr/bin/kpager +debian/tmp/usr/share/applications/kde/kpager.desktop +debian/tmp/usr/share/applnk/Utilities/kpager.desktop +debian/tmp/usr/share/doc/kde/HTML/en/kpager/common +debian/tmp/usr/share/doc/kde/HTML/en/kpager/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kpager/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kpager/screenshot.png +debian/tmp/usr/share/doc/kde/HTML/en/kpager/settings.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kpager.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kpager.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kpager.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kpager.png + +debian/icons/kpager.xpm /usr/share/pixmaps +debian/icons/kpager-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kdm.dirs +++ kdebase-3.5.6/debian/kdm.dirs @@ -0,0 +1 @@ +var/lib/kdm --- kdebase-3.5.6.orig/debian/konsole.postinst +++ kdebase-3.5.6/debian/konsole.postinst @@ -0,0 +1,43 @@ +#! /bin/sh +# postinst script for konsole +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/konsole 35 \ + --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- kdebase-3.5.6.orig/debian/kdesktop.preinst +++ kdebase-3.5.6/debian/kdesktop.preinst @@ -0,0 +1,25 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/kde3/debian/debian.desktop + rm -f /etc/kde3/debian/debian.html + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/libkonq4.docs +++ kdebase-3.5.6/debian/libkonq4.docs @@ -0,0 +1 @@ +libkonq/SERVICEMENUS --- kdebase-3.5.6.orig/debian/kdebase-dev.install +++ kdebase-3.5.6/debian/kdebase-dev.install @@ -0,0 +1,87 @@ +debian/tmp/usr/include/kde/kate/application.h +debian/tmp/usr/include/kde/kate/documentmanager.h +debian/tmp/usr/include/kde/kate/mainwindow.h +debian/tmp/usr/include/kde/kate/pluginconfiginterfaceextension.h +debian/tmp/usr/include/kde/kate/pluginconfiginterface.h +debian/tmp/usr/include/kde/kate/plugin.h +debian/tmp/usr/include/kde/kate/pluginmanager.h +debian/tmp/usr/include/kde/kate/toolviewmanager.h +debian/tmp/usr/include/kde/kate/utils/dockviewbase.h +debian/tmp/usr/include/kde/kate/utils/listboxview.h +debian/tmp/usr/include/kde/kate/utils/messageview.h +debian/tmp/usr/include/kde/kate/viewmanager.h +debian/tmp/usr/include/kde/KBackgroundIface.h +debian/tmp/usr/include/kde/kcommondecoration.h +debian/tmp/usr/include/kde/kdecorationfactory.h +debian/tmp/usr/include/kde/kdecoration.h +debian/tmp/usr/include/kde/kdecoration_p.h +debian/tmp/usr/include/kde/kdecoration_plugins_p.h +debian/tmp/usr/include/kde/KDesktopIface.h +debian/tmp/usr/include/kde/kgreeterplugin.h +debian/tmp/usr/include/kde/konqsidebarplugin.h +debian/tmp/usr/include/kde/KonquerorIface.h +debian/tmp/usr/include/kde/KScreensaverIface.h +debian/tmp/usr/include/kde/ksgrd/HostConnector.h +debian/tmp/usr/include/kde/ksgrd/SensorAgent.h +debian/tmp/usr/include/kde/ksgrd/SensorClient.h +debian/tmp/usr/include/kde/ksgrd/SensorManager.h +debian/tmp/usr/include/kde/ksgrd/SensorShellAgent.h +debian/tmp/usr/include/kde/ksgrd/SensorSocketAgent.h +debian/tmp/usr/include/kde/ksgrd/StyleEngine.h +debian/tmp/usr/include/kde/ksgrd/StyleSettings.h +debian/tmp/usr/include/kde/ksgrd/TimerSettings.h +debian/tmp/usr/include/kde/ksplash/objkstheme.h +debian/tmp/usr/include/kde/ksplash/themeengine.h +debian/tmp/usr/include/kde/kwin/client.h +debian/tmp/usr/include/kde/KWinInterface.h +debian/tmp/usr/include/kde/kwin/kwinbutton.h +debian/tmp/usr/include/kde/kwin/options.h +debian/tmp/usr/include/kde/kwin/workspace.h +debian/tmp/usr/lib/libkasbar.la +debian/tmp/usr/lib/libkasbar.so +debian/tmp/usr/lib/libkateinterfaces.la +debian/tmp/usr/lib/libkateinterfaces.so +debian/tmp/usr/lib/libkateutils.la +debian/tmp/usr/lib/libkateutils.so +debian/tmp/usr/lib/libkdecorations.la +debian/tmp/usr/lib/libkdecorations.so +debian/tmp/usr/lib/libkdeinit_appletproxy.la +debian/tmp/usr/lib/libkdeinit_extensionproxy.la +debian/tmp/usr/lib/libkdeinit_kaccess.la +debian/tmp/usr/lib/libkdeinit_kate.la +debian/tmp/usr/lib/libkdeinit_kcminit.la +debian/tmp/usr/lib/libkdeinit_kcontroledit.la +debian/tmp/usr/lib/libkdeinit_kcontrol.la +debian/tmp/usr/lib/libkdeinit_kdesktop.la +debian/tmp/usr/lib/libkdeinit_keditbookmarks.la +debian/tmp/usr/lib/libkdeinit_kfmclient.la +debian/tmp/usr/lib/libkdeinit_khelpcenter.la +debian/tmp/usr/lib/libkdeinit_khotkeys.la +debian/tmp/usr/lib/libkdeinit_kicker.la +debian/tmp/usr/lib/libkdeinit_kjobviewer.la +debian/tmp/usr/lib/libkdeinit_klipper.la +debian/tmp/usr/lib/libkdeinit_kmenuedit.la +debian/tmp/usr/lib/libkdeinit_konqueror.la +debian/tmp/usr/lib/libkdeinit_konsole.la +debian/tmp/usr/lib/libkdeinit_kprinter.la +debian/tmp/usr/lib/libkdeinit_ksmserver.la +debian/tmp/usr/lib/libkdeinit_kwin.la +debian/tmp/usr/lib/libkdeinit_kwin_rules_dialog.la +debian/tmp/usr/lib/libkdeinit_kwrite.la +debian/tmp/usr/lib/libkdeinit_kxkb.la +debian/tmp/usr/lib/libkfontinst.la +debian/tmp/usr/lib/libkfontinst.so +debian/tmp/usr/lib/libkhotkeys_shared.la +debian/tmp/usr/lib/libkhotkeys_shared.so +debian/tmp/usr/lib/libkickermain.la +debian/tmp/usr/lib/libkickermain.so +debian/tmp/usr/lib/libkonqsidebarplugin.la +debian/tmp/usr/lib/libkonqsidebarplugin.so +debian/tmp/usr/lib/libksgrd.la +debian/tmp/usr/lib/libksgrd.so +debian/tmp/usr/lib/libksplashthemes.la +debian/tmp/usr/lib/libksplashthemes.so +debian/tmp/usr/lib/libtaskbar.la +debian/tmp/usr/lib/libtaskbar.so +debian/tmp/usr/lib/libtaskmanager.la +debian/tmp/usr/lib/libtaskmanager.so --- kdebase-3.5.6.orig/debian/kdm.postinst +++ kdebase-3.5.6/debian/kdm.postinst @@ -0,0 +1,137 @@ +#! /bin/sh + +set -e + +# source debconf library +. /usr/share/debconf/confmodule + +# debconf is not a registry, so we only fiddle with the default file if it +# does not exist +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager +if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + DAEMON_NAME= + if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then + DAEMON_NAME="$RET" + fi + if [ ! -n "$DAEMON_NAME" ]; then + # if we were unable to determine the name of the selected daemon (for + # instance, if the selected default display manager doesn't provide a + # daemon_name question), guess + DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) + if [ ! -n "$DAEMON_NAME" ]; then + echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "unable to determine path to default X display manager" \ + # "$DEFAULT_DISPLAY_MANAGER; not updating" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + if [ -n "$DAEMON_NAME" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "committing change of default X display manager" + echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi +fi + +# remove the displaced old default display manager file if it exists +if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then + rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" +fi + +# restarting the daemon may cause output to stdout +db_stop + +# don't start kdm if we are upgrading without stopping it +NOSTART= +if [ -e /var/run/kdm.upgrade ]; then + NOSTART=yes +fi +# or if we're currently in X on the display it attempts to manage by default +for HOST in "" \ + "localhost" \ + "$(hostname 2> /dev/null)" \ + "$(hostname -f 2> /dev/null)"; do + if echo "$DISPLAY" | grep -q "^$HOST:0.*"; then + NOSTART=yes + break + fi +done +# or if it's already running +if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid --name kdm; then + NOSTART=yes +fi +# or if the options file says not to +if ! grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options; then + NOSTART=yes +fi + + +# md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge +SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e + +CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/kde3/kdm/kdmrc | sed s/^ConfigVersion=//` + +if [ -e /etc/kde3/kdm/kdmrc ]; then + if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then + KDMRCUPDATED=yes + fi +fi + +if [ -e /etc/kde3/kdm/Xservers ]; then + if [ `md5sum /etc/kde3/kdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then + XSERVERSUNCHANGED=yes + fi +fi + +# With KDE 3.4, /etc/kde3/kdm/Xservers is no longer required, so we remove it, if +# the user has updated their kdmrc (if they haven't, kdm notices and keeps using +# Xservers), and if it wasn't touched, i.e. there are no local changes the user +# will want to merge into kdmrc. + +case "$1" in + + configure) + + if [ ! -z $KDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then + echo "Removing obsolete /etc/kde3/kdm/Xservers (detected no user changes)." + rm -f /etc/kde3/kdm/Xservers + elif [ ! -z $KDMRCUPDATED ] && [ -e /etc/kde3/kdm/Xservers ]; then + echo "Note that /etc/kde3/kdm/Xservers is no longer used by KDM." + echo "You must merge your changes (if any) into /etc/kde3/kdm/kdmrc manually." + echo "Otherwise, /etc/kde3/kdm/Xservers is safe to remove." + fi + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + + +if [ -x "/etc/init.d/kdm" ]; then + update-rc.d kdm defaults 99 01 >/dev/null +fi + +if [ -n "$NOSTART" ]; then + exit 0 +else + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d kdm start || true + else + /etc/init.d/kdm start || true + fi +fi + +exit 0 --- kdebase-3.5.6.orig/debian/80ubuntu-xmodmap +++ kdebase-3.5.6/debian/80ubuntu-xmodmap @@ -0,0 +1,13 @@ +# Set the Ubuntu laptop keycode -> xkeysyms mapping (used by KDE) +# +# This file is sourced by Xsession(5), not executed. +# The "|| true" is to ensure that the Xsession script does not terminate on error +/usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true + +USRMODMAP="$HOME/.Xmodmap" + +if [ -x /usr/bin/xmodmap ]; then + if [ -f "$USRMODMAP" ]; then + /usr/bin/xmodmap "$USRMODMAP" || true + fi +fi --- kdebase-3.5.6.orig/debian/ktip.install +++ kdebase-3.5.6/debian/ktip.install @@ -0,0 +1,16 @@ +debian/tmp/usr/bin/ktip +debian/tmp/usr/share/applications/kde/ktip.desktop +debian/tmp/usr/share/applnk/Toys/ktip.desktop +debian/tmp/usr/share/apps/kdewizard/pics/wizard_small.png +debian/tmp/usr/share/apps/kdewizard/tips +debian/tmp/usr/share/autostart/ktip.desktop +debian/tmp/usr/share/icons/hicolor/128x128/apps/ktip.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/ktip.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/ktip.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/ktip.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/ktip.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/ktip.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/ktip.svgz + +debian/icons/ktip.xpm /usr/share/pixmaps +debian/icons/ktip-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kmenuedit.manpages +++ kdebase-3.5.6/debian/kmenuedit.manpages @@ -0,0 +1 @@ +debian/man/kmenuedit.1 --- kdebase-3.5.6.orig/debian/kcontrol.menu +++ kdebase-3.5.6/debian/kcontrol.menu @@ -0,0 +1,23 @@ +?package(kcontrol):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KControl"\ + icon32x32="/usr/share/pixmaps/kcontrol.xpm"\ + icon16x16="/usr/share/pixmaps/kcontrol-16.xpm"\ + command="/usr/bin/kcontrol" + +?package(kcontrol):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KInfoCenter"\ + icon32x32="/usr/share/pixmaps/kinfocenter.xpm"\ + icon16x16="/usr/share/pixmaps/kinfocenter-16.xpm"\ + command="/usr/bin/kinfocenter" + +# Icon 32x32 kcontrol/kcontrol/cr32-app-kcontrol.png kcontrol.xpm +# Icon 16x16 kcontrol/kcontrol/cr16-app-kcontrol.png kcontrol-16.xpm + +# Icon 32x32 kcontrol/pics/cr32-app-hwinfo.png kinfocenter.xpm +# Icon 16x16 kcontrol/pics/cr16-app-hwinfo.png kinfocenter-16.xpm --- kdebase-3.5.6.orig/debian/kdm.init +++ kdebase-3.5.6/debian/kdm.init @@ -0,0 +1,137 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: x-display-manager kdm +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Should-Start: console-screen +# Should-Stop: console-screen +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: X display manager for KDE +# Description: KDM manages a collection of X servers, which may be on the local host or remote machines. +### END INIT INFO +# /etc/init.d/kdm: start or stop the X display manager +# Script originally stolen from the xdm package +# +# description: K Display Manager +# +set -e + +# To start kdm even if it is not the default display manager, change +# HEED_DEFAULT_DISPLAY_MANAGER to "false." +HEED_DEFAULT_DISPLAY_MANAGER=true +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/usr/bin/kdm +PIDFILE=/var/run/kdm.pid +UPGRADEFILE=/var/run/kdm.upgrade + +test -x $DAEMON || exit 0 + +# uncomment, if you want auto-logon to be runlevel-dependant +#test "$runlevel" || { runlevel=`runlevel`; runlevel=${runlevel#* }; } +#test "$runlevel" = 4 && ARG=-autolog || ARG=-noautolog + +# uncomment, if you want tons of debug info in your syslog +#ARG="$ARG -debug 255" + +# If we upgraded the daemon, we can't use the --exec argument to +# start-stop-daemon since the inode will have changed. The risk here is that +# in a situation where the daemon died, its pidfile was not cleaned up, and +# some other process is now running under that pid, start-stop-daemon will send +# signals to an innocent process. However, this seems like a corner case. +# C'est la vie! +if [ -e $UPGRADEFILE ]; then + SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON" +else + SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON" +fi + +stillrunning () { + if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then + true + else + # if the daemon does not remove its own pidfile, we will + rm -f $PIDFILE $UPGRADEFILE + false + fi; +} + +case "$1" in + start) + if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && + [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && + [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then + echo "Not starting K Display Manager (kdm); it is not the default display manager." + else + echo -n "Starting K Display Manager: kdm" + start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" + echo "." + fi + ;; + + restart) + /etc/init.d/kdm stop + if [ -f $PIDFILE ]; then + if stillrunning; then + exit 1 + fi + fi + /etc/init.d/kdm start + ;; + + reload) + echo -n "Reloading K Display Manager configuration..." + if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then + echo "done." + else + echo "kdm not running." + fi + ;; + + force-reload) + /etc/init.d/kdm reload + ;; + + stop) + echo -n "Stopping K Display Manager: kdm" + if [ ! -f $PIDFILE ]; then + echo " not running ($PIDFILE not found)." + exit 0 + else + DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]') + KILLCOUNT=1 + if [ ! -e $UPGRADEFILE ]; then + if start-stop-daemon --stop --quiet $SSD_ARGS; then + # give kdm's signal handler a second to catch its breath + sleep 1 + else + echo -n " not running" + fi + fi + while [ $KILLCOUNT -le 5 ]; do + if stillrunning; then + kill $DAEMONPID + else + break + fi + sleep 1 + KILLCOUNT=$(( $KILLCOUNT + 1 )) + done + if stillrunning; then + echo -n " not responding to TERM signal (pid $DAEMONPID)" + else + rm -f $UPGRADEFILE + fi + fi + echo "." + ;; + + *) + echo "Usage: /etc/init.d/kdm {start|stop|restart|reload|force-reload}" + exit 1 + ;; +esac + +exit 0 --- kdebase-3.5.6.orig/debian/kmenuedit.menu +++ kdebase-3.5.6/debian/kmenuedit.menu @@ -0,0 +1,11 @@ +?package(kmenuedit):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KMenuEdit"\ + icon32x32="/usr/share/pixmaps/kmenuedit.xpm"\ + icon16x16="/usr/share/pixmaps/kmenuedit-16.xpm"\ + command="/usr/bin/kmenuedit" + +# Icon 32x32 kmenuedit/cr32-app-kmenuedit.png kmenuedit.xpm +# Icon 16x16 kmenuedit/cr16-app-kmenuedit.png kmenuedit-16.xpm --- kdebase-3.5.6.orig/debian/ksysguard.install +++ kdebase-3.5.6/debian/ksysguard.install @@ -0,0 +1,36 @@ +debian/tmp/usr/bin/kpm +debian/tmp/usr/bin/ksysguard +debian/tmp/usr/lib/kde3/sysguard_panelapplet.la +debian/tmp/usr/lib/kde3/sysguard_panelapplet.so +debian/tmp/usr/lib/libksgrd.so.1 +debian/tmp/usr/lib/libksgrd.so.1.2.0 +debian/tmp/usr/share/applications/kde/ksysguard.desktop +debian/tmp/usr/share/apps/kicker/applets/ksysguardapplet.desktop +debian/tmp/usr/share/apps/ksysguard/eventsrc +debian/tmp/usr/share/apps/ksysguard/KSysGuardApplet.xml +debian/tmp/usr/share/apps/ksysguard/ksysguardui.rc +debian/tmp/usr/share/apps/ksysguard/pics/computer.png +debian/tmp/usr/share/apps/ksysguard/pics/daemon.png +debian/tmp/usr/share/apps/ksysguard/pics/kdeapp.png +debian/tmp/usr/share/apps/ksysguard/pics/kernel.png +debian/tmp/usr/share/apps/ksysguard/pics/ksysguardd.png +debian/tmp/usr/share/apps/ksysguard/pics/running.png +debian/tmp/usr/share/apps/ksysguard/pics/shell.png +debian/tmp/usr/share/apps/ksysguard/pics/tools.png +debian/tmp/usr/share/apps/ksysguard/pics/unknownapp.png +debian/tmp/usr/share/apps/ksysguard/pics/waiting.png +debian/tmp/usr/share/apps/ksysguard/pics/X.png +debian/tmp/usr/share/apps/ksysguard/ProcessTable.sgrd +debian/tmp/usr/share/apps/ksysguard/SystemLoad.sgrd +debian/tmp/usr/share/doc/kde/HTML/en/ksysguard/common +debian/tmp/usr/share/doc/kde/HTML/en/ksysguard/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/ksysguard/index.docbook +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/ksysguard.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/ksysguard.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/ksysguard.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/ksysguard.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/ksysguard.png +debian/tmp/usr/share/mimelnk/application/x-ksysguard.desktop + +debian/icons/ksysguard.xpm /usr/share/pixmaps +debian/icons/ksysguard-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kcontrol.postinst +++ kdebase-3.5.6/debian/kcontrol.postinst @@ -0,0 +1,14 @@ +#!/bin/sh -e + +case "$1" in + + configure) + LINK="/etc/udev/rules.d/025_logitechmouse.rules" + [ -e "$LINK" ] || [ -L "$LINK" ] || ln -s ../logitechmouse.rules "$LINK" + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/ksmserver.postinst +++ kdebase-3.5.6/debian/ksmserver.postinst @@ -0,0 +1,46 @@ +#! /bin/sh +# postinst script for ksmserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + update-alternatives --install /usr/bin/x-session-manager \ + x-session-manager /usr/bin/startkde 40 \ + --slave /usr/share/man/man1/x-session-manager.1.gz \ + x-session-manager.1.gz "/usr/share/man/man1/startkde.1.gz" + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- kdebase-3.5.6.orig/debian/klipper.lintian +++ kdebase-3.5.6/debian/klipper.lintian @@ -0,0 +1,3 @@ +klipper: no-shlibs-control-file usr/lib/libkdeinit_klipper.so +klipper: postinst-must-call-ldconfig usr/lib/libkdeinit_klipper.so +klipper: postrm-should-call-ldconfig usr/lib/libkdeinit_klipper.so --- kdebase-3.5.6.orig/debian/klipper.install +++ kdebase-3.5.6/debian/klipper.install @@ -0,0 +1,28 @@ +debian/tmp/etc/kde3/klipperrc +debian/tmp/usr/bin/klipper +debian/tmp/usr/lib/kde3/klipper.la +debian/tmp/usr/lib/kde3/klipper_panelapplet.la +debian/tmp/usr/lib/kde3/klipper_panelapplet.so +debian/tmp/usr/lib/kde3/klipper.so +debian/tmp/usr/lib/libkdeinit_klipper.so +debian/tmp/usr/share/applications/kde/klipper.desktop +debian/tmp/usr/share/apps/kconf_update/klipper-1-2.pl +debian/tmp/usr/share/apps/kconf_update/klipper-kde31.sh +debian/tmp/usr/share/apps/kconf_update/klipperrc.upd +debian/tmp/usr/share/apps/kconf_update/klippershortcuts.upd +debian/tmp/usr/share/apps/kicker/applets/klipper.desktop +debian/tmp/usr/share/autostart/klipper.desktop +debian/tmp/usr/share/doc/kde/HTML/en/klipper/common +debian/tmp/usr/share/doc/kde/HTML/en/klipper/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/klipper/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/klipper/screenshot.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/klipper.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/klipper.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/klipper.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/klipper.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/klipper.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/klipper.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/klipper.svgz + +debian/icons/klipper.xpm /usr/share/pixmaps +debian/icons/klipper-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.kmenuedit +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.kmenuedit @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-kmenuedit +Title: KMenuEdit Handbook +Author: Milos Prudek, Lauri Watts +Abstract: KMenuEdit allows the editing of the KDE main menu. +Section: Apps/System + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kmenuedit/index.html +Files: /usr/share/doc/kde/HTML/en/kmenuedit/*.html + --- kdebase-3.5.6.orig/debian/icons/kmenuedit-16.xpm +++ kdebase-3.5.6/debian/icons/kmenuedit-16.xpm @@ -0,0 +1,108 @@ +/* XPM */ +static char *kmenuedit-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 86 1", +" c #000010", +". c #000011", +"X c #030111", +"o c gray35", +"O c #1B1BFF", +"+ c #4D73EC", +"@ c #9F2000", +"# c #9E2102", +"$ c #A12401", +"% c #BB3300", +"& c #BE3A05", +"* c #B1431A", +"= c #B84B1E", +"- c #AF4323", +"; c #8A5744", +": c #866359", +"> c #997D74", +", c #AC6C45", +"< c #BB774D", +"1 c #C65615", +"2 c #D24F0E", +"3 c #D4662D", +"4 c #E25A0A", +"5 c #E76E1A", +"6 c #FA7504", +"7 c #AD987F", +"8 c #FA8712", +"9 c #FF9907", +"0 c #E68836", +"q c #FC9F2B", +"w c #FFA101", +"e c #FFAD1C", +"r c #FFB600", +"t c #FFB40E", +"y c #FFBB04", +"u c #EBBE24", +"i c #FFAD24", +"p c #D19F4B", +"a c #C49E7C", +"s c #CEAF7B", +"d c #E0B744", +"f c #F9A84F", +"g c #FFBB4A", +"h c #ECB67D", +"j c #FECD01", +"k c #F1C013", +"l c #FFC919", +"z c #FAD10D", +"x c #FFC427", +"c c #FFC135", +"v c #F9CA3B", +"b c #FCD72B", +"n c #FEDA39", +"m c #FACE5C", +"M c #FDD647", +"N c #FFD54A", +"B c #FDD659", +"V c #FFD75B", +"C c #F9CC6A", +"Z c #FFE05F", +"A c #998682", +"S c #959597", +"D c #979798", +"F c #99999A", +"G c #9B9B9B", +"H c #B0A090", +"J c #A7A7A7", +"K c #8CB7FF", +"L c #95B3E9", +"P c #A9CFFF", +"I c #C99682", +"U c #DAB79C", +"Y c #C1BCBC", +"T c #E7C793", +"R c #F3C589", +"E c #FFD485", +"W c #FFDF9D", +"Q c #CDCDCE", +"! c #D1C8C8", +"~ c #DFD6CC", +"^ c #DEDCDA", +"/ c gray87", +"( c #F7ECE3", +") c gray97", +"_ c gray100", +"` c None", +/* pixels */ +"*-1HJJJJJJJJo```", +"=hZp))))))))o```", +"3irk~////JJJJJJo", +"%6wjsPPPPJ)))))o", +"$49yuLKKKJ/////o", +"`&8tzA+++JPPPPPo", +"`@5elv())JKKKKKo", +"``2qxbT^/J+++++o", +"``@0cnd7GJ)))))o", +"..`fBBm/ooooooo", +"...D,EWRGGGGo```", +"...G!IUa))))o```", +"...DQY:;////o```", +"```J////////o```", +"```oooooooooo```" +}; --- kdebase-3.5.6.orig/debian/icons/kfm-16.xpm +++ kdebase-3.5.6/debian/icons/kfm-16.xpm @@ -0,0 +1,221 @@ +/* XPM */ +static char *kfm-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 199 2", +" c black", +". c #000072", +"X c #020475", +"o c #091683", +"O c #0A1985", +"+ c #0B1A8E", +"@ c #051690", +"# c #041994", +"$ c #0A1B91", +"% c #161C83", +"& c #0C208A", +"* c #0D238D", +"= c #0F2E99", +"- c #0C2E9D", +"; c #182389", +": c #102395", +"> c #122F96", +", c #142B94", +"< c #152E97", +"1 c #172C9A", +"2 c #1C2E95", +"3 c #133299", +"4 c #16389E", +"5 c #0B2AA2", +"6 c #0E30AF", +"7 c #1028A0", +"8 c #173DA1", +"9 c #1B39A8", +"0 c #23399A", +"q c #1E4EAF", +"w c #1B4EB3", +"e c #194DB5", +"r c #1850BD", +"t c #1F58BC", +"y c #33469F", +"u c #3C459B", +"i c #2141A2", +"p c #2643AB", +"a c #2348B8", +"s c #2155B3", +"d c #235BB9", +"f c #375AB5", +"g c #325CB8", +"h c #2561BD", +"j c #3860BD", +"k c #1A5DCB", +"l c #2553C7", +"z c #2453C8", +"x c #2F5DD3", +"c c #2364C8", +"v c #2062D0", +"b c #2261D7", +"n c #2667D2", +"m c #2864D5", +"M c #2D67D4", +"N c #2670DA", +"B c #2870D2", +"V c #3262C0", +"C c #3267C2", +"Z c #326AD1", +"A c #376DD0", +"S c #3B70CE", +"D c #2D77E3", +"F c #347FE2", +"G c #3C7AE6", +"H c #3D7EFE", +"J c #575EA8", +"K c #5D75BB", +"L c #4071C5", +"P c #4371C5", +"I c #4179DD", +"U c #597DC4", +"Y c #437FE4", +"T c #3E8CED", +"R c #3788F3", +"E c #358CF9", +"W c #358DFB", +"Q c #3D80F1", +"! c #4A81D4", +"~ c #5E8DCF", +"^ c #4784E8", +"/ c #4F87E9", +"( c #4886FE", +") c #4C8AFE", +"_ c #4196FE", +"` c #4296FD", +"' c #499BFB", +"] c #4A9CFE", +"[ c #4A9DFE", +"{ c #4B9DFE", +"} c #5A91E7", +"| c #5592FE", +" . c #5996FE", +".. c #5D9AFE", +"X. c #4EA0FE", +"o. c #50A1FE", +"O. c #51A2FE", +"+. c #52A2FE", +"@. c #56A3FE", +"#. c #54A4FC", +"$. c #55A4FE", +"%. c #57A6FE", +"&. c #5DAAFE", +"*. c #5EABFE", +"=. c #698FCD", +"-. c #688DDF", +";. c #7987C4", +":. c #7A8BCC", +">. c #728BD5", +",. c #629EFE", +"<. c #71A0DA", +"1. c #65A1E2", +"2. c #6CA7E3", +"3. c #68A2ED", +"4. c #67A3FE", +"5. c #60ACFE", +"6. c #61ADFE", +"7. c #62ADFE", +"8. c #6BA6FE", +"9. c #68ADFD", +"0. c #6DA9FE", +"q. c #6EA9FE", +"w. c #66B0FE", +"e. c #69B2FE", +"r. c #6AB3FE", +"t. c #6CB5FE", +"y. c #6EB6FE", +"u. c #71A7EA", +"i. c #7EA4E5", +"p. c #76AAF3", +"a. c #71AAFE", +"s. c #72AEFE", +"d. c #74AFFF", +"f. c #77AEFE", +"g. c #7BB1EB", +"h. c #7CB3EC", +"j. c #7FBBED", +"k. c #71B4FF", +"l. c #71B8FF", +"z. c #72B9FF", +"x. c #73BAFF", +"c. c #74BAFF", +"v. c #78B0FF", +"b. c #78B3FF", +"n. c #7AB4FF", +"m. c #7BB6FF", +"M. c #7CB7FB", +"N. c #7DB7FF", +"B. c #78BDFF", +"V. c #7CC0FF", +"C. c #7FC2FF", +"Z. c #82A3DF", +"A. c #86AFDF", +"S. c #88A3D6", +"D. c #8EA1D2", +"F. c #90A7D8", +"G. c #85BDEC", +"H. c #89BFED", +"J. c #80B8F2", +"K. c #80BAFF", +"L. c #86BFFF", +"P. c #9AAEE0", +"I. c #82C4FF", +"U. c #84C6FF", +"Y. c #85C6FF", +"T. c #89C2FF", +"R. c #88C4FF", +"E. c #8BC4FF", +"W. c #8CC5FF", +"Q. c #8BCBFF", +"!. c #9CC3EB", +"~. c #93CBFF", +"^. c #97CFFF", +"/. c #9EC6F2", +"(. c #94D1FF", +"). c #96D1FF", +"_. c #96D2FF", +"`. c #98D3FF", +"'. c #9AD1FF", +"]. c #9FD6FF", +"[. c #AAC5E9", +"{. c #AAC4ED", +"}. c #ABC7ED", +"|. c #ABC8F5", +" X c #A5DBFF", +".X c #A6DAFF", +"XX c #A7DDFF", +"oX c #A8DEFF", +"OX c #BDD3EE", +"+X c #B3D3F3", +"@X c #B6E3FE", +"#X c #C1DDF6", +"$X c #C3E9FF", +"%X c #CEE1F5", +"&X c #CAE3F8", +"*X c #D2E2F4", +"=X c #D6EBFA", +"-X c gray100", +";X c None", +/* pixels */ +";X;X;X;X;X;X;Xq w k w 8 ;X;X;X;X", +";X;X;X;X;Xq t N W _ W r 3 ;X;X;X", +";X;X;Xd c Q ' +.X.X.[ _ v = * ;X", +";Xh B T #.*.6.6.w.&.%.X.[ D - O ", +";Xn 9.6.e.y.z.z.k.y.w.*.#.{ R 5 ", +";Xb H s.B.C.Y.Y.I.C.c.e.#.Q x 6 ", +";Xm ( ) f.).).`.(.Q.k.^ -.P.>.# ", +";XM | ...a..XXXY.} Z.}.i.G l @ ", +";XZ ,.4.8.a.v.p.}.+Xg.C , I 9 7 ", +";XA 0.f.b.M.M.3.#XG.2.P f ;.:.$ ", +";XS n.K.L.T.E.2.*X=.U F.|./ z + ", +";Xj M.W.~.^.'.g.S.[./.! < Y a : ", +";X4 g j.]..XXXT.&Xj.1.P j p 1 . ", +";X;X> 9 <.@X$X!.%XA.~ 0 2 . ;X;X", +";X;X;X;X& K =XOXD.y ; . ;X;X;X;X", +";X;X;X;X;Xo u J % X ;X;X;X;X;X;X" +}; --- kdebase-3.5.6.orig/debian/icons/kpager.xpm +++ kdebase-3.5.6/debian/icons/kpager.xpm @@ -0,0 +1,100 @@ +/* XPM */ +static char *kpager[] = { +/* columns rows colors chars-per-pixel */ +"32 32 62 1", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c #070707", +"# c gray3", +"$ c #090909", +"% c #0B0B0B", +"& c #0C0C0C", +"* c gray5", +"= c gray8", +"- c #181818", +"; c #1D1D1D", +": c gray12", +"> c #323232", +", c gray30", +"< c #585858", +"1 c #7A7979", +"2 c #7C7C7C", +"3 c #7E7E7E", +"4 c #008586", +"5 c #00898A", +"6 c #008D8F", +"7 c #009193", +"8 c #009598", +"9 c #00999C", +"0 c #009EA1", +"q c #00A2A5", +"w c #00A6AA", +"e c #00AAAE", +"r c #00AEB3", +"t c #818181", +"y c gray51", +"u c #848484", +"i c #888888", +"p c #8B8B8B", +"a c gray65", +"s c gray66", +"d c #A9A9A9", +"f c #AAAAAA", +"g c #AEAEAC", +"h c #B1B1B1", +"j c gray70", +"k c #B6B6B6", +"l c gray74", +"z c #C3C3C3", +"x c #C5C5C5", +"c c #DADADA", +"v c #DDDBDB", +"b c #E1E1E1", +"n c gray92", +"m c gray93", +"M c #EEEEEE", +"N c #F1F1F1", +"B c gray95", +"V c #F8F8F8", +"C c #FDFDFD", +"Z c #FEFEFE", +"A c gray100", +"S c None", +/* pixels */ +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +" SSSSSS", +" AAA,45678990qwwrAAA,AAA, SSSSSS", +" All,45678990qwwrAll,All, SSSSSS", +" All,45678990qwwrAll,All, SSSSSS", +" ,,,,,,,,,,,,,,,,,,,,,,,, SSSSSS", +" uggAAAAAAAAAACAAAAAAACAz SSSSSS", +" uggAAAAAAAAACACACACACACz SS S", +" uvvAAAAAAAAAACACACACACAz S S", +" uvvAAAAAAAAACAAACACACAAz S S", +" uvvAAAAAAAAAAAAnVCACAAAz S SS", +" uvvAAAAAAAAAAAMahnbx111< = SSS", +" uvvAAAAAAAAAAA111111111< :SSSS", +" uvvAAAAAAAAAAAh2yapy211< SSS", +" uvvAAAAAAAAAAACAAAAMf12< O SS", +" uvvAAAAAAAAACACAACAAV11< O %S", +" uvvAAAAAAAAAACAAAACAAu1< %S O ", +" uvvAAAAAAAAAAACACCAAc11<%SSSOO ", +" uggAAAAAAAAACAACACCk111< S O:S", +" uggAAAAAAAAAAAAACnf1111< SS", +" uzzzzzzzzzzzxzzzz2<<<<<< * SSSS", +" % - SSS", +"SSSSSSSSSSSSSSSSS >SSSS SSS", +"SSSSSSSSSSSSSSSS OSSSSSSO :SSS", +"SSSSSSSSSSSSSSSSS OSSSSSS %SSSS", +"SSSSSSSSSSSSSSSS %OSSSSS *SSSSS", +"SSSSSSSSSSSSSSS %SSSSSS SSSSS", +"SSSSSSSSSSSSSSS SSSSSSSS SSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSS SSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS", +"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS" +}; --- kdebase-3.5.6.orig/debian/icons/kinfocenter-16.xpm +++ kdebase-3.5.6/debian/icons/kinfocenter-16.xpm @@ -0,0 +1,193 @@ +/* XPM */ +static char * kinfocenter_16_xpm[] = { +"16 16 174 2", +" c None", +". c #A6DBF4", +"+ c #CFEBF9", +"@ c #C9EAF9", +"# c #A1DCF7", +"$ c #CEE0F3", +"% c #D9E4F4", +"& c #E6EEF8", +"* c #E7EEF8", +"= c #DCE5F5", +"- c #BCE3FF", +"; c #256589", +"> c #64B0E5", +", c #B2CBEA", +"' c #A3C5E9", +") c #DEEAF7", +"! c #B4CDED", +"~ c #5CB5F0", +"{ c #419CDF", +"] c #86B0DF", +"^ c #7CACDF", +"/ c #B8D2EE", +"( c #86AFDF", +"_ c #3CA2EB", +": c #004D85", +"< c #A3A3CF", +"[ c #9188AD", +"} c #034A82", +"| c #0884DF", +"1 c #428FD6", +"2 c #5995D6", +"3 c #DAE7F6", +"4 c #DBE7F6", +"5 c #3E8ED5", +"6 c #0683DD", +"7 c #005FA0", +"8 c #8B8BAC", +"9 c #ACA3B8", +"0 c #01386D", +"a c #0078DA", +"b c #0072CE", +"c c #1377CD", +"d c #CAE0F4", +"e c #1177CD", +"f c #0071D9", +"g c #0F7B8C", +"h c #378B1E", +"i c #399D25", +"j c #34A721", +"k c #0D7A05", +"l c #4C4C5F", +"m c #ABA4C5", +"n c #0A3C47", +"o c #006DC9", +"p c #0067C9", +"q c #0067C8", +"r c #CAE1F4", +"s c #0068C8", +"t c #0063C8", +"u c #3C9E7A", +"v c #80E35A", +"w c #5DCF47", +"x c #80DB6D", +"y c #2B9022", +"z c #8989B1", +"A c #9D98BD", +"B c #254925", +"C c #358FAE", +"D c #0056C6", +"E c #005BC3", +"F c #8EB8E3", +"G c #005BC2", +"H c #0059CC", +"I c #2775BB", +"J c #8BA78C", +"K c #739B66", +"L c #14A100", +"M c #54C841", +"N c #2E8F29", +"O c #9D9DCD", +"P c #9792B8", +"Q c #254B25", +"R c #A2ED8B", +"S c #3589A8", +"T c #0057BA", +"U c #0058C3", +"V c #0059C8", +"W c #005AC2", +"X c #096F88", +"Y c #4DA653", +"Z c #75906A", +"` c #415E3E", +" . c #089000", +".. c #4CC33F", +"+. c #2B8D29", +"@. c #9A9AC8", +"#. c #9691B8", +"$. c #204624", +"%. c #BAED84", +"&. c #B4EF90", +"*. c #55B464", +"=. c #4B9092", +"-. c #489093", +";. c #59A87D", +">. c #67C14F", +",. c #7ACF60", +"'. c #96C38D", +"). c #7EAB78", +"!. c #70C06C", +"~. c #7ED279", +"{. c #218821", +"]. c #9491B8", +"^. c #254022", +"/. c #D7A95B", +"(. c #8CE254", +"_. c #A0E879", +":. c #86847C", +"<. c #699351", +"[. c #6FD35D", +"}. c #65C173", +"|. c #79CC6C", +"1. c #919091", +"2. c #555455", +"3. c #70B06E", +"4. c #88D688", +"5. c #1F861F", +"6. c #938FB6", +"7. c #214325", +"8. c #BAD581", +"9. c #86E262", +"0. c #7BDA61", +"a. c #92B98F", +"b. c #3BAB1A", +"c. c #48AB88", +"d. c #548DF3", +"e. c #4BC042", +"f. c #46AA3E", +"g. c #31942F", +"h. c #2AA72A", +"i. c #62CC62", +"j. c #289028", +"k. c #908BB4", +"l. c #234729", +"m. c #D6F289", +"n. c #DAEA82", +"o. c #C2E56D", +"p. c #E2EA86", +"q. c #B0E85D", +"r. c #8BB66D", +"s. c #447F68", +"t. c #4C8F4B", +"u. c #4A9148", +"v. c #4B924B", +"w. c #4D8E4D", +"x. c #498E49", +"y. c #0D650D", +"z. c #A0A0CE", +"A. c #9490BA", +"B. c #234A27", +"C. c #E6E569", +"D. c #F0E26C", +"E. c #F1E978", +"F. c #EFD85C", +"G. c #F5FA8B", +"H. c #8EA842", +"I. c #000100", +"J. c #686699", +"K. c #0C1E12", +"L. c #1E4018", +"M. c #1D3D18", +"N. c #1E3E18", +"O. c #1D3D17", +"P. c #1E3F1A", +"Q. c #183815", +" . + @ # ", +" $ % & * = - ; ", +" > , ' ) ) ' ! ~ ", +" { ] ^ / / ^ ( _ : ", +"< [ } | 1 2 3 4 2 5 6 7 ", +"8 9 0 a b c d d e b f g h i j k ", +"l m n o p q r r q s t u v w x y ", +"z A B C D E F F G H I J K L M N ", +"O P Q R S T U V W X Y Z ` ...+.", +"@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.", +"@.].^./.(._.:.<.[.}.|.1.2.3.4.5.", +"@.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.", +"@.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.", +"z.A.B.C.D.E.F.G.H.I. ", +" J.K.L.M.N.O.P.Q. ", +" "}; --- kdebase-3.5.6.orig/debian/icons/kfind-16.xpm +++ kdebase-3.5.6/debian/icons/kfind-16.xpm @@ -0,0 +1,214 @@ +/* XPM */ +static char *kfind-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 192 2", +" c black", +". c #000104", +"X c #000204", +"o c #000205", +"O c #010204", +"+ c #010205", +"@ c #010305", +"# c #020305", +"$ c #030405", +"% c #000308", +"& c #00040B", +"* c #050608", +"= c #07080A", +"- c #0B0C0E", +"; c #0D0E0F", +": c #180E08", +"> c #231606", +", c #2F2D42", +"< c #3A3C4D", +"1 c #664920", +"2 c #585577", +"3 c #646B78", +"4 c #656D79", +"5 c #6D747E", +"6 c #636181", +"7 c #676484", +"8 c #656F81", +"9 c #6D6C8D", +"0 c #626A96", +"q c #747B87", +"w c #7C7F98", +"e c #7880A3", +"r c #6F8AC3", +"t c #698CCE", +"y c #7C95C2", +"u c #9B5602", +"i c #AC7022", +"p c #9F8472", +"a c #A2836E", +"s c #C2873B", +"d c #D1903E", +"f c #CCA65A", +"g c #EABF5F", +"h c #F7C450", +"j c #FBC552", +"k c #FAC654", +"l c #FFD471", +"z c #8487A6", +"x c #8888A2", +"c c #9396AE", +"v c #9B9EB5", +"b c #9A9EB9", +"n c #93A1B9", +"m c #93A2BD", +"M c #9DA3B4", +"N c #9EA6B7", +"B c #98A6BD", +"V c #9CA9BF", +"C c #A5A7BC", +"Z c #9FABC0", +"A c #A0ADC2", +"S c #A1ADC2", +"D c #ABADC2", +"F c #A9ACC7", +"G c #A2B0C8", +"H c #AAB3CD", +"J c #ABB9D8", +"K c #B2B3C9", +"L c #B3B6CC", +"P c #B2BCCD", +"I c #B3BDCD", +"U c #B4BECD", +"Y c #ACBFE2", +"T c #9FCCFF", +"R c #B6C0CD", +"E c #B7C0CD", +"W c #B9C1CC", +"Q c #B6C2D2", +"! c #B5C4D7", +"~ c #B3C1D8", +"^ c #B8C3D8", +"/ c #BAC3D9", +"( c #BCC8DF", +") c #BFCFDE", +"_ c #A6C6E4", +"` c #A5CDFF", +"' c #A4D1FE", +"] c #AFD4FF", +"[ c #B8C7E2", +"{ c #B7D0EE", +"} c #B1D0F2", +"| c #B4DBFF", +" . c #B5DAFF", +".. c #BADAFF", +"X. c #B2E0FF", +"o. c #BFE1FF", +"O. c #BFE3FF", +"+. c #BDE4FC", +"@. c #DFCEBB", +"#. c #ECC882", +"$. c #F3CD86", +"%. c #FEE786", +"&. c #FFEF90", +"*. c #C7C6D4", +"=. c #C1C6D8", +"-. c #C8C6D1", +";. c #CDCBD8", +":. c #CECEDA", +">. c #CECFDC", +",. c #C3D0DF", +"<. c #CED0DD", +"1. c #C0CDE3", +"2. c #C2CEE4", +"3. c #C0CFE8", +"4. c #C3D1E7", +"5. c #C4D2E7", +"6. c #C7D2E4", +"7. c #C8D2E3", +"8. c #CDD3E1", +"9. c #CFD5E5", +"0. c #C8D3E8", +"q. c #C9DAE8", +"w. c #CCD8EF", +"e. c #C2DFFF", +"r. c #CDDBF2", +"t. c #D4D8E5", +"y. c #D6D9E6", +"u. c #D1DBEB", +"i. c #D2DDEF", +"p. c #D7DEE8", +"a. c #D1DCF1", +"s. c #CAE6FF", +"d. c #C9EDFF", +"f. c #CEE9FF", +"g. c #D4E0EB", +"h. c #DCE3EC", +"j. c #D7E0F0", +"k. c #D7E1F2", +"l. c #D7E1F3", +"z. c #D6E2F5", +"x. c #D9E3F2", +"c. c #DAE3F4", +"v. c #DBE4F4", +"b. c #DDE5F1", +"n. c #DFE5F1", +"m. c #DFE8F7", +"M. c #DFE9FB", +"N. c #D2F5FF", +"B. c #D4F4FF", +"V. c #D9F6FF", +"C. c #DAF5FF", +"Z. c #D8FBFF", +"A. c #E6E4E5", +"S. c #E2E2E8", +"D. c #E5E8EF", +"F. c #E0E7F2", +"G. c #E0E7F3", +"H. c #E1E8F2", +"J. c #E2E8F2", +"K. c #E4EAF3", +"L. c #E1EAF9", +"P. c #E2EBF8", +"I. c #E1ECF9", +"U. c #E4EDFC", +"Y. c #E6EFFF", +"T. c #EAEEF3", +"R. c #E9EDF5", +"E. c #ECEFF2", +"W. c #E8EEF9", +"Q. c #E2FCFF", +"!. c #E3FCFF", +"~. c #ECF0F7", +"^. c #EDF4F7", +"/. c #EEF5F7", +"(. c #E9F1FF", +"). c #EAF0FC", +"_. c #EBF5FF", +"`. c #E8FFFF", +"'. c #ECFEFF", +"]. c #EDFFFF", +"[. c #F0F6FF", +"{. c #F4FAFF", +"}. c #F5FAFF", +"|. c #F6FAFE", +" X c #F8F6F7", +".X c #F8FAFC", +"XX c #F9FFFF", +"oX c #FCFFFF", +"OX c #FDFFFF", +"+X c #FEFEFE", +"@X c gray100", +"#X c None", +/* pixels */ +"#X#X2.u.n.J.J.n.n.n.a.4 #X#X#X", +"#X#X1.n.@X@X@X@X@X_.l.P.5 #X#X", +"#X#X1.n.@X@X@X@X@X|.l.~.XXq #X", +"#X#X5.n. X;.*.:.S.|.P.7.6.3.8 ", +"#X#XH =.C ! g.h.8.<.W.n.( [ m * ", +"#X#X9 z _ Z.`.'.!.q.<.i.0.w.n $ ", +"#X#X7 y X.d.B.C.B.O./ 9.a.l.B # ", +"#X#X6 t T .O.O.| ` _ t.v.M.V # ", +"#X#X2 r ] e.f.s...` J y.P.Y.C $ ", +"#X#X, 0 } !.'.'.C.{ L K.U.(.Z $ ", +"#X#X- w e ) /./.,.v F -.D._.Z $ ", +"#X#X3 p.-.x c v D K p h #.(.G $ ", +"#X#Xw.n.@X.XT.R.|.T.s h %.$.N & ", +"#X#X5.H.@X@X@X@X@X@XA.d h &.f > ", +"#X#X^ ! U U U I I I ~ M i h l 1 ", +"#X#X#X= # # # # # # # & : u a < " +}; --- kdebase-3.5.6.orig/debian/icons/kwrite.xpm +++ kdebase-3.5.6/debian/icons/kwrite.xpm @@ -0,0 +1,270 @@ +/* XPM */ +static char *kwrite[] = { +/* columns rows colors chars-per-pixel */ +"32 32 232 2", +" c #000000", +". c #0A0802", +"X c #000718", +"o c #1C1802", +"O c #131413", +"+ c #000C3A", +"@ c #2A2509", +"# c #362D05", +"$ c #342F0D", +"% c #38320B", +"& c #000A58", +"* c #021855", +"= c #031A5A", +"- c #031C64", +"; c #112762", +": c #443319", +"> c #4A3519", +", c #524C0B", +"< c #6F552B", +"1 c #615739", +"2 c #70582D", +"3 c #7E543E", +"4 c #505B63", +"5 c #586162", +"6 c #072D99", +"7 c #082C95", +"8 c #012BA5", +"9 c #032DA9", +"0 c #0630AA", +"q c #0832AB", +"w c #0B35B3", +"e c #0E39BA", +"r c #163DB8", +"t c #123CC4", +"y c #2E498E", +"u c #2747B1", +"i c #2548B6", +"p c #2449BD", +"a c #2949B1", +"s c #284DBC", +"d c #3253B5", +"f c #3758BB", +"g c #3F5DBB", +"h c #1640C5", +"j c #1A42C4", +"k c #1B43C9", +"l c #274BC7", +"z c #224AC9", +"x c #2A4EC1", +"c c #284ECD", +"v c #2B53C5", +"b c #2D53D0", +"n c #3356C4", +"m c #3759C8", +"M c #385CC5", +"N c #3B5FCC", +"B c #365BDE", +"V c #2951E0", +"C c #3E61CA", +"Z c #3961D0", +"A c #435DA9", +"S c #4158B2", +"D c #425DBA", +"F c #4261BD", +"G c #5062A9", +"H c #546EB6", +"J c #5C73B6", +"K c #657691", +"L c #6075B6", +"P c #707EBD", +"I c #4766C9", +"U c #4C6ACA", +"Y c #4365D2", +"T c #456BD7", +"R c #4970DA", +"E c #536CC5", +"W c #5A70C6", +"Q c #5275D3", +"! c #5B7ADD", +"~ c #4166E0", +"^ c #5173EA", +"/ c #5679E3", +"( c #5D7EE4", +") c #597BEE", +"_ c #697ECC", +"` c #637EDD", +"' c #637FE3", +"] c #7D887B", +"[ c #7681B6", +"{ c #5E80E4", +"} c #5F83EB", +"| c #6481C0", +" . c #6381CF", +".. c #6A80CC", +"X. c #6780DD", +"o. c #6981DC", +"O. c #6E88DF", +"+. c #7389D9", +"@. c #7E93DF", +"#. c #7C9DDF", +"$. c #6382E4", +"%. c #6382E8", +"&. c #6A86E4", +"*. c #6886EB", +"=. c #6D88E5", +"-. c #6E8BE8", +";. c #6686F0", +":. c #6A8AF4", +">. c #6F92F1", +",. c #738BE5", +"<. c #758CE8", +"1. c #788EE4", +"2. c #7691E6", +"3. c #7790EB", +"4. c #759AE0", +"5. c #7B92E5", +"6. c #7B95E8", +"7. c #7C9EE2", +"8. c #7395F1", +"9. c #834B0F", +"0. c #844C14", +"q. c #845B28", +"w. c #AC7B49", +"e. c #99851A", +"r. c #98804D", +"t. c #988054", +"y. c #958A7C", +"u. c #BC9552", +"i. c #ABA855", +"p. c #B3AF58", +"a. c #BDA16E", +"s. c #C0A61C", +"d. c #C6BE2B", +"f. c #CFB92F", +"g. c #FA9F12", +"h. c #F58D21", +"j. c #FC8E25", +"k. c #F98D2A", +"l. c #FD9225", +"z. c #FF9529", +"x. c #FF9F34", +"c. c #FAA218", +"v. c #FFBC00", +"b. c #E0AE2E", +"n. c #F9B13F", +"m. c #DAA74A", +"M. c #D0AE69", +"N. c #FFAB44", +"B. c #FFC001", +"V. c #FFCD0B", +"C. c #FFD209", +"Z. c #FFC425", +"A. c #FFD02D", +"S. c #FFEF13", +"D. c #FFED1C", +"F. c #FFF40D", +"G. c #FFF416", +"H. c #FFF11A", +"J. c #FFEB23", +"K. c #FFE63F", +"L. c #D7D357", +"P. c #F7D84D", +"I. c #EFC578", +"U. c #FFD672", +"Y. c #FFDA7E", +"T. c #EFEA70", +"R. c #8D8281", +"E. c #9E9290", +"W. c #9E9798", +"Q. c #9497B3", +"!. c #94A6BA", +"~. c #BCBF8E", +"^. c #8C93C6", +"/. c #8396DA", +"(. c #969ECF", +"). c #8397E4", +"_. c #869AE3", +"`. c #8098EB", +"'. c #94A9DE", +"]. c #9DAEDE", +"[. c #93A6EA", +"{. c #91A9E1", +"}. c #96AAED", +"|. c #9CADEC", +" X c #97ACF1", +".X c #9FB0ED", +"XX c #A1B1DE", +"oX c #A3B4ED", +"OX c #A8B7EE", +"+X c #ABB9EE", +"@X c #A5B4F1", +"#X c #A6B8F0", +"$X c #ACBDF0", +"%X c #B0BEF1", +"&X c #B9C09E", +"*X c #9BC0F4", +"=X c #AAC6EF", +"-X c #ADD2FF", +";X c #B8C3EF", +":X c #B5C1F0", +">X c #B0C3FD", +",X c #BAC6F2", +".t * zXD.D.D.D.V.v.v.c.k.z.0. ", +"zXzXzX8 x tXhXgXwXU XXlXlXlXjX>.t & , H.H.D.V.v.v.c.k.z.0. zX", +"zXzXzX9 _.hXwXwXgXwXU XXlXkXdXjX:.i d.H.D.V.v.v.c.k.z.0. zXzX", +"zXzX9 n 7X7X7XrXtXsX7XU '.dXjXlXfXL.G.D.V.v.v.c.k.z.0. zXzXzX", +"zX0 w ).:X%X7XwXwXwXrX,XC '.lXjXT.F.D.V.v.v.c.k.z.0. zXzXzXzX", +"zX8 n |.oX,X7X7X7X7X,X7X%XI {.iXP.G.V.v.v.c.k.z.0. zXzXzXzXzX", +"0 w o..X=X,X:X:X:X:X+X:X,XoXZ Q.U.A.v.v.c.k.l.9. zXzXzXzXzXzX", +"0 l 6..XoXoXoX+X+XoX+X+X+X#X.XD E.Y.Z.g.j.l.3 + zXzXzXzXzXzXzX", +"6 d ~.5XL o.5.5.6.[..X|.}..XoX(.D W.Y.N.h.w.A t * zXzXzXzXzXzXzX", +"O p.[ 5 y D <.$.&.1.1.6.[.|./.[ ^.S R.a.y.!.eX;.t * zXzXzXzXzXzX", +"% f.; h a E } ,.1.&.$.,.5.6...G P _ s [ 0X2XqXaX;.t * zXzXzXzXzX", +". e.s.4 F 4X~.L ` $.,.1.&.$.,.+.O.2.-.N 7.qX2XyXpX;.t * zXzXzX", +"zX # @ i.y.K y f 1.1.=.$.,.,.&.-.2.3.%.n 7.yX-X2XpX*.t * zXzX", +"zXzXzX$ d.; h u W =.=.$.,.,.{ &.&.-.$.$.{ n 4.1X-XaX>XV 7 zXzX", +"zXzXzX. e.s.4 g 5X&XH .1.$.$.=.&.$.{ $.$.! v *XuX9X^ t * zXzX", +"zXzXzXzX. # @ i.y.K y g =.$.+.=.$.{ $.$.( ( v =XeX^ t = zXzX", +"zXzXzXzXzXzX% f.; h a E o.,.,.$.{ &.$.{ { Z .eX^ t = zXzXzX", +"zXzXzXzXzXzX. e.s.4 F &X&XJ ! $.&.&.{ { ( M #X) t = zXzXzXzX", +"zXzXzXzXzXzXzX. # @ i.] K y f ,.&.( ( *.Y Q ) t = zXzXzXzXzX", +"zXzXzXzXzXzXzXzXzX$ f.; t u E $.$.$.&.` v ~ h = zXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzX. e.s.4 g 4X&XH ! -.Y z k = zXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzX. # @ i.] K y g ` z t = zXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzX$ f.; t a E b w = zXzXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzX. e.s.5 c B e = zXzXzXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzXzX. # o - w = zXzXzXzXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX X zXzXzXzXzXzXzXzXzXzXzXzX" +}; --- kdebase-3.5.6.orig/debian/icons/khelpcenter-16.xpm +++ kdebase-3.5.6/debian/icons/khelpcenter-16.xpm @@ -0,0 +1,209 @@ +/* XPM */ +static char *khelpcenter-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 187 2", +" c black", +". c #020000", +"X c #030000", +"o c #040300", +"O c #080000", +"+ c #080100", +"@ c #090000", +"# c #0B0000", +"$ c #130000", +"% c #150600", +"& c #150800", +"* c #1A0200", +"= c #1F0000", +"- c #1F0200", +"; c #200200", +": c #210400", +"> c #210503", +", c #240200", +"< c #240300", +"1 c #240400", +"2 c #240900", +"3 c #290600", +"4 c #290700", +"5 c #2F0600", +"6 c #2C0A01", +"7 c #340D00", +"8 c #3A0B00", +"9 c #3F0B00", +"0 c #3A1100", +"q c #4F0300", +"w c #4E0700", +"e c #401300", +"r c #4F1E0B", +"t c #52230D", +"y c #532915", +"u c #680E00", +"i c #6E1100", +"p c #6A1A00", +"a c #7C0D04", +"s c #701500", +"d c #731A00", +"f c #6D2712", +"g c #773822", +"h c #7C413A", +"j c #8D1F00", +"k c #842F0E", +"l c #892305", +"z c #8E2B06", +"x c #8B3D24", +"c c #A01B00", +"v c #AF1C02", +"b c #A22200", +"n c #A92600", +"m c #A63C1F", +"M c #B82900", +"N c #964D33", +"B c #99593F", +"V c #B05235", +"C c #BF5331", +"Z c #BC5540", +"A c #B56548", +"S c #BC7762", +"D c #CF1914", +"F c #D11E17", +"G c #CD2403", +"H c #C52914", +"J c #C43207", +"K c #C6360D", +"L c #D62C28", +"P c #DA3533", +"I c #E61814", +"U c #FF0701", +"Y c #F21316", +"T c #FB1314", +"R c #FF1E1C", +"E c #E42F15", +"W c #E22F1C", +"Q c #E63009", +"! c #E72C2D", +"~ c #E62F30", +"^ c #F32D2F", +"/ c #FF2B25", +"( c #FE3132", +") c #FF3736", +"_ c #C2481F", +"` c #CD4C2C", +"' c #C64F33", +"] c #ED5A3F", +"[ c #E9603A", +"{ c #C05A51", +"} c #C66347", +"| c #C56F5C", +" . c #E84244", +".. c #EE4344", +"X. c #ED4749", +"o. c #EA5C5E", +"O. c #EC7374", +"+. c #FF6E6F", +"@. c #E49B7C", +"#. c #E59C7C", +"$. c #FD927B", +"%. c #BE8B81", +"&. c #C19582", +"*. c #C19782", +"=. c #C29682", +"-. c #C49783", +";. c #D09F87", +":. c #DA9D82", +">. c #DF9F87", +",. c #DFA08B", +"<. c #DCA890", +"1. c #D8A89A", +"2. c #DAA99C", +"3. c #D8AFA7", +"4. c #D9B5AC", +"5. c #DDB6AC", +"6. c #DEB7AE", +"7. c #E59E81", +"8. c #FF8586", +"9. c #FF8E86", +"0. c #FE8E8C", +"q. c #F29982", +"w. c #F89787", +"e. c #FF9488", +"r. c #FA9699", +"t. c #E5A487", +"y. c #E1A48B", +"u. c #E2A48B", +"i. c #E4A28A", +"p. c #E4A88E", +"a. c #EEAA8D", +"s. c #EBAE93", +"d. c #F1A996", +"f. c #E4B8A3", +"g. c #E8B9A4", +"h. c #ECBCA5", +"j. c #FFADA5", +"k. c #FFAEAF", +"l. c #FAAEB0", +"z. c #FEAEB0", +"x. c #F9B2A1", +"c. c #FEB1A9", +"v. c #FEB0AA", +"b. c #FFBBA4", +"n. c #F8BCAF", +"m. c #FDB7B9", +"M. c #FFBCB9", +"N. c #FFBEB8", +"B. c #F8CEBD", +"V. c #FDC3C5", +"C. c #FFC7C0", +"Z. c #FFC8CA", +"A. c #FDCBCD", +"S. c #FECECD", +"D. c #FDCFD2", +"F. c #FAD6C6", +"G. c #FFD9CF", +"H. c #F0D8D6", +"J. c #FFD7DA", +"K. c #FFD7DB", +"L. c #E7E9E9", +"P. c #EDF6F7", +"I. c #F0E4E3", +"U. c #F0ECEA", +"Y. c #FEE1E3", +"T. c #FFE9EB", +"R. c #FFEDEB", +"E. c #FDF0EB", +"W. c #F6FFFF", +"Q. c #F7FFFF", +"!. c #F9F3F4", +"~. c #FBF5F2", +"^. c #FAF8F7", +"/. c #F9FFFF", +"(. c #FAFFFF", +"). c #FBFFFF", +"_. c #FFFBFA", +"`. c #FDFAFE", +"'. c #FFFCFB", +"]. c #FFFDFB", +"[. c #FFFEF8", +"{. c #FDFFFF", +"}. c #FFFDFC", +"|. c #FFFEFD", +" X c #FEFFFF", +".X c gray100", +"XX c None", +/* pixels */ +"XXXXXXXXu.a.s.u.#.N k XXXXXXXXXX", +"XXXXXXi.B.E.].|.|.C.$._ 8 XXXXXX", +"XX*.,.c.T.|.|.|.`.J.J.N.] e XXXX", +"XX>.j.Z.A.R.F.g.q.e.V.D.M.` $ XX", +":.w.k.m.9.} y : 5 l X.l.Y.G.f ", +"7.c.z.0.' % XXXX p d./.|.S ", +"p.|.!.x.r XXXXXXXX+ A ^.|.2.- ", +"u.|./.f.* XXXXXXXXXXXXg ~.|.6.3 ", +"@.]./.h.6 XXXXXXXXXXXXm H.|.4.1 ", +"B ].W.n.z XXXXXXXXXXb H o.8.{ + ", +"t b.r.X.E p + XXXXc v P ..) a ", +" K / ^ ! W V x ' | L ~ ( F ; ", +"XX0 Q R Y X.I.U.L.P.O.T I w XX", +"XXXXe G U +./././.|.D.D q XX", +"XXXXXX& i C 1.6.3.%.h : XXXX", +"XXXXXXXX ; 3 < + XXXXXXXX" +}; --- kdebase-3.5.6.orig/debian/icons/kate.xpm +++ kdebase-3.5.6/debian/icons/kate.xpm @@ -0,0 +1,270 @@ +/* XPM */ +static char *kate[] = { +/* columns rows colors chars-per-pixel */ +"32 32 232 2", +" c #000000", +". c #0A0802", +"X c #000718", +"o c #1C1802", +"O c #131413", +"+ c #000C3A", +"@ c #2A2509", +"# c #362D05", +"$ c #342F0D", +"% c #38320B", +"& c #000A58", +"* c #021855", +"= c #031A5A", +"- c #031C64", +"; c #112762", +": c #443319", +"> c #4A3519", +", c #524C0B", +"< c #6F552B", +"1 c #615739", +"2 c #70582D", +"3 c #7E543E", +"4 c #505B63", +"5 c #586162", +"6 c #072D99", +"7 c #082C95", +"8 c #012BA5", +"9 c #032DA9", +"0 c #0630AA", +"q c #0832AB", +"w c #0B35B3", +"e c #0E39BA", +"r c #163DB8", +"t c #123CC4", +"y c #2E498E", +"u c #2747B1", +"i c #2548B6", +"p c #2449BD", +"a c #2949B1", +"s c #284DBC", +"d c #3253B5", +"f c #3758BB", +"g c #3F5DBB", +"h c #1640C5", +"j c #1A42C4", +"k c #1B43C9", +"l c #274BC7", +"z c #224AC9", +"x c #2A4EC1", +"c c #284ECD", +"v c #2B53C5", +"b c #2D53D0", +"n c #3356C4", +"m c #3759C8", +"M c #385CC5", +"N c #3B5FCC", +"B c #365BDE", +"V c #2951E0", +"C c #3E61CA", +"Z c #3961D0", +"A c #435DA9", +"S c #4158B2", +"D c #425DBA", +"F c #4261BD", +"G c #5062A9", +"H c #546EB6", +"J c #5C73B6", +"K c #657691", +"L c #6075B6", +"P c #707EBD", +"I c #4766C9", +"U c #4C6ACA", +"Y c #4365D2", +"T c #456BD7", +"R c #4970DA", +"E c #536CC5", +"W c #5A70C6", +"Q c #5275D3", +"! c #5B7ADD", +"~ c #4166E0", +"^ c #5173EA", +"/ c #5679E3", +"( c #5D7EE4", +") c #597BEE", +"_ c #697ECC", +"` c #637EDD", +"' c #637FE3", +"] c #7D887B", +"[ c #7681B6", +"{ c #5E80E4", +"} c #5F83EB", +"| c #6481C0", +" . c #6381CF", +".. c #6A80CC", +"X. c #6780DD", +"o. c #6981DC", +"O. c #6E88DF", +"+. c #7389D9", +"@. c #7E93DF", +"#. c #7C9DDF", +"$. c #6382E4", +"%. c #6382E8", +"&. c #6A86E4", +"*. c #6886EB", +"=. c #6D88E5", +"-. c #6E8BE8", +";. c #6686F0", +":. c #6A8AF4", +">. c #6F92F1", +",. c #738BE5", +"<. c #758CE8", +"1. c #788EE4", +"2. c #7691E6", +"3. c #7790EB", +"4. c #759AE0", +"5. c #7B92E5", +"6. c #7B95E8", +"7. c #7C9EE2", +"8. c #7395F1", +"9. c #834B0F", +"0. c #844C14", +"q. c #845B28", +"w. c #AC7B49", +"e. c #99851A", +"r. c #98804D", +"t. c #988054", +"y. c #958A7C", +"u. c #BC9552", +"i. c #ABA855", +"p. c #B3AF58", +"a. c #BDA16E", +"s. c #C0A61C", +"d. c #C6BE2B", +"f. c #CFB92F", +"g. c #FA9F12", +"h. c #F58D21", +"j. c #FC8E25", +"k. c #F98D2A", +"l. c #FD9225", +"z. c #FF9529", +"x. c #FF9F34", +"c. c #FAA218", +"v. c #FFBC00", +"b. c #E0AE2E", +"n. c #F9B13F", +"m. c #DAA74A", +"M. c #D0AE69", +"N. c #FFAB44", +"B. c #FFC001", +"V. c #FFCD0B", +"C. c #FFD209", +"Z. c #FFC425", +"A. c #FFD02D", +"S. c #FFEF13", +"D. c #FFED1C", +"F. c #FFF40D", +"G. c #FFF416", +"H. c #FFF11A", +"J. c #FFEB23", +"K. c #FFE63F", +"L. c #D7D357", +"P. c #F7D84D", +"I. c #EFC578", +"U. c #FFD672", +"Y. c #FFDA7E", +"T. c #EFEA70", +"R. c #8D8281", +"E. c #9E9290", +"W. c #9E9798", +"Q. c #9497B3", +"!. c #94A6BA", +"~. c #BCBF8E", +"^. c #8C93C6", +"/. c #8396DA", +"(. c #969ECF", +"). c #8397E4", +"_. c #869AE3", +"`. c #8098EB", +"'. c #94A9DE", +"]. c #9DAEDE", +"[. c #93A6EA", +"{. c #91A9E1", +"}. c #96AAED", +"|. c #9CADEC", +" X c #97ACF1", +".X c #9FB0ED", +"XX c #A1B1DE", +"oX c #A3B4ED", +"OX c #A8B7EE", +"+X c #ABB9EE", +"@X c #A5B4F1", +"#X c #A6B8F0", +"$X c #ACBDF0", +"%X c #B0BEF1", +"&X c #B9C09E", +"*X c #9BC0F4", +"=X c #AAC6EF", +"-X c #ADD2FF", +";X c #B8C3EF", +":X c #B5C1F0", +">X c #B0C3FD", +",X c #BAC6F2", +".t * zXD.D.D.D.V.v.v.c.k.z.0. ", +"zXzXzX8 x tXhXgXwXU XXlXlXlXjX>.t & , H.H.D.V.v.v.c.k.z.0. zX", +"zXzXzX9 _.hXwXwXgXwXU XXlXkXdXjX:.i d.H.D.V.v.v.c.k.z.0. zXzX", +"zXzX9 n 7X7X7XrXtXsX7XU '.dXjXlXfXL.G.D.V.v.v.c.k.z.0. zXzXzX", +"zX0 w ).:X%X7XwXwXwXrX,XC '.lXjXT.F.D.V.v.v.c.k.z.0. zXzXzXzX", +"zX8 n |.oX,X7X7X7X7X,X7X%XI {.iXP.G.V.v.v.c.k.z.0. zXzXzXzXzX", +"0 w o..X=X,X:X:X:X:X+X:X,XoXZ Q.U.A.v.v.c.k.l.9. zXzXzXzXzXzX", +"0 l 6..XoXoXoX+X+XoX+X+X+X#X.XD E.Y.Z.g.j.l.3 + zXzXzXzXzXzXzX", +"6 d ~.5XL o.5.5.6.[..X|.}..XoX(.D W.Y.N.h.w.A t * zXzXzXzXzXzXzX", +"O p.[ 5 y D <.$.&.1.1.6.[.|./.[ ^.S R.a.y.!.eX;.t * zXzXzXzXzXzX", +"% f.; h a E } ,.1.&.$.,.5.6...G P _ s [ 0X2XqXaX;.t * zXzXzXzXzX", +". e.s.4 F 4X~.L ` $.,.1.&.$.,.+.O.2.-.N 7.qX2XyXpX;.t * zXzXzX", +"zX # @ i.y.K y f 1.1.=.$.,.,.&.-.2.3.%.n 7.yX-X2XpX*.t * zXzX", +"zXzXzX$ d.; h u W =.=.$.,.,.{ &.&.-.$.$.{ n 4.1X-XaX>XV 7 zXzX", +"zXzXzX. e.s.4 g 5X&XH .1.$.$.=.&.$.{ $.$.! v *XuX9X^ t * zXzX", +"zXzXzXzX. # @ i.y.K y g =.$.+.=.$.{ $.$.( ( v =XeX^ t = zXzX", +"zXzXzXzXzXzX% f.; h a E o.,.,.$.{ &.$.{ { Z .eX^ t = zXzXzX", +"zXzXzXzXzXzX. e.s.4 F &X&XJ ! $.&.&.{ { ( M #X) t = zXzXzXzX", +"zXzXzXzXzXzXzX. # @ i.] K y f ,.&.( ( *.Y Q ) t = zXzXzXzXzX", +"zXzXzXzXzXzXzXzXzX$ f.; t u E $.$.$.&.` v ~ h = zXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzX. e.s.4 g 4X&XH ! -.Y z k = zXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzX. # @ i.] K y g ` z t = zXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzX$ f.; t a E b w = zXzXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzX. e.s.5 c B e = zXzXzXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzXzX. # o - w = zXzXzXzXzXzXzXzXzXzXzX", +"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX X zXzXzXzXzXzXzXzXzXzXzXzX" +}; --- kdebase-3.5.6.orig/debian/icons/kjobviewer-16.xpm +++ kdebase-3.5.6/debian/icons/kjobviewer-16.xpm @@ -0,0 +1,159 @@ +/* XPM */ +static char *kjobviewer-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 137 2", +" c black", +". c gray5", +"X c #252525", +"o c #313131", +"O c #323232", +"+ c #333335", +"@ c #464646", +"# c #4D4D4F", +"$ c #545455", +"% c #555556", +"& c #56565B", +"* c #59595B", +"= c #58585D", +"- c #5A5A62", +"; c #5C5C68", +": c #606065", +"> c #6C6C6E", +", c #6F6F74", +"< c #707073", +"1 c #76767E", +"2 c #7C7C80", +"3 c #7F7F84", +"4 c #008CFD", +"5 c #008EFF", +"6 c #239EFF", +"7 c #498ADF", +"8 c #538FDE", +"9 c #40A1ED", +"0 c #4BB5FD", +"q c #51B8FD", +"w c #6699DE", +"e c #6A9CDE", +"r c #7EA7DF", +"t c #76C7FD", +"y c #84848C", +"u c #878792", +"i c #898990", +"p c #898993", +"a c #93939E", +"s c #8B9AB2", +"d c #9999A7", +"f c #9A9AA6", +"g c #90A3BF", +"h c #A3A3AB", +"j c #A0A0AC", +"k c #A6A6AD", +"l c #A3A3B2", +"z c #A9A9B2", +"x c #AFAFB6", +"c c #AFAFB7", +"v c #A5BABC", +"b c #B0B0B7", +"n c #B1B1B6", +"m c #B1B1B9", +"M c #B4B4BD", +"N c #83A9DE", +"B c #8FB1D3", +"V c #8BB2DA", +"C c #9BB6DE", +"Z c #9EB7DF", +"A c #B3B3C1", +"S c #B3B3C2", +"D c #B1B1C5", +"F c #B9B9C0", +"G c #B9B9C4", +"H c #BEBECA", +"J c #BDBDCE", +"K c #8BCDFC", +"L c #A8C2E4", +"P c #A9C3E6", +"I c #AAC3E5", +"U c #ACC7E7", +"Y c #ADC7E7", +"T c #AFC9E8", +"R c #B9D5F0", +"E c #C0C0C9", +"W c #C7C7CE", +"Q c #C0C5D7", +"! c #C4C6D7", +"~ c #C8C8D2", +"^ c #CACAD6", +"/ c #CBCBD6", +"( c #CACDD4", +") c #CDCDDA", +"_ c #CFD4DC", +"` c #D0D0D1", +"' c #D2D2D2", +"] c #D0D0DC", +"[ c #D5D5DB", +"{ c #D5D5DE", +"} c #D6D6E1", +"| c #D7D7E0", +" . c #D8D8E2", +".. c #DADAE3", +"X. c #DBDBE3", +"o. c #DDDDE2", +"O. c #DFDFE6", +"+. c #C9E5F9", +"@. c #CBE6FA", +"#. c #CEE8FA", +"$. c #D5EBFB", +"%. c #DBEEFB", +"&. c #DCEEFB", +"*. c #E0E1E7", +"=. c #E1E1E9", +"-. c #E2E2E8", +";. c #E3E3E9", +":. c #E2E2EA", +">. c #E3E3EB", +",. c #E4E4E8", +"<. c #E4E4E9", +"1. c #E5E5EB", +"2. c #E6E6EB", +"3. c #E6E6EC", +"4. c #E8E8EC", +"5. c #E9E9EE", +"6. c #E2E8F1", +"7. c #EBEBF0", +"8. c #E9ECF3", +"9. c #EBEFF6", +"0. c #ECECF0", +"q. c #ECF2F8", +"w. c #F4F4F7", +"e. c #F0F5FA", +"r. c #F1F5FA", +"t. c #F2F6FA", +"y. c #F6F6F8", +"u. c #F5F9FB", +"i. c #F6F8FC", +"p. c #F8FBFD", +"a. c #FBFBFC", +"s. c #F9FCFD", +"d. c #FAFCFD", +"f. c #FCFCFD", +"g. c #FEFFFF", +"h. c gray100", +"j. c None", +/* pixels */ +"j.j.j.j.A =.;.;.;.;.*.f j.j.j.j.", +"j.j.j.j.H h.h.h.h.d.d.j j.j.j.j.", +"j.j.j.j.G h.h.h.d.u.i.f j.j.j.j.", +"j.j.j.j.M h.h.h.u.q.u.a j.j.j.j.", +"j.j.j.j.z h.d.u.t.9.9.p j.j.j.j.", +"j.@ # m x d.u.q.q.6.8.k c @ O j.", +"% | =.=.g T Y Y P P P s | | ~ O ", +"F 3.3.,.R &.&.$.#.@.@.V ) v ) 3 ", +"{ 5.3.( K t q 0 0 0 0 9 | . .b ", +"k ,.3.B 6 5 5 5 5 5 5 5 { 2...i ", +"u D D Q C r w 7 8 e N Z ! D D 1 ", +"y J A = & & & & & & & & : J J , ", +"2 ) H < ' ' ' ' ' ' ' ( > ^ ) * ", +"% W =.{ h.h.h.h.h.h.h.h.( *.x X ", +"j.. - w.h.h.h.h.h.h.d.y.o.+ j.", +"j.j.l 4.0.5.5.0.5.4.4.,.o.; j.j." +}; --- kdebase-3.5.6.orig/debian/icons/konqueror-16.xpm +++ kdebase-3.5.6/debian/icons/konqueror-16.xpm @@ -0,0 +1,175 @@ +/* XPM */ +static char *konqueror-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 153 2", +" c black", +". c #000001", +"X c #000002", +"o c #020101", +"O c #030207", +"+ c #04040C", +"@ c #07070C", +"# c #080607", +"$ c #090A10", +"% c #0C0C12", +"& c #0F0F14", +"* c #18181C", +"= c #000321", +"- c #1B1B22", +"; c #1C1C26", +": c #313139", +"> c #33333E", +", c #00215E", +"< c #102446", +"1 c #153154", +"2 c #153F71", +"3 c #373743", +"4 c #3D3D4B", +"5 c #434349", +"6 c #4E494E", +"7 c #494954", +"8 c #4E4C5B", +"9 c #52525A", +"0 c #53515D", +"q c #555564", +"w c #505B77", +"e c #5E5E71", +"r c #6C6C75", +"t c #6C687C", +"y c #0027C7", +"u c #0034C8", +"i c #003ACA", +"p c #003ECC", +"a c #225495", +"s c #0042CF", +"d c #0656D7", +"f c #0D50D0", +"g c #115AD5", +"h c #0059E7", +"j c #1F66D9", +"k c #1E67DB", +"l c #1E6EDD", +"z c #1D73E5", +"x c #256EDD", +"c c #266FDD", +"v c #2770DD", +"b c #3A74DE", +"n c #2873EB", +"m c #496697", +"M c #536E98", +"N c #597DAD", +"B c #717182", +"V c #747181", +"C c #77778E", +"Z c #4A7FD8", +"A c #2D80E3", +"S c #3088F6", +"D c #7F8397", +"F c #6789BA", +"G c #6C85B1", +"H c #488EE7", +"J c #5D93E2", +"K c #5F9DE9", +"L c #5F9EEE", +"P c #7586C7", +"I c #63A0EA", +"U c #65A1EB", +"Y c #66A3EC", +"T c #65A7EF", +"R c #64A0F4", +"E c #64A8F0", +"W c #67B0F4", +"Q c #6CB1F4", +"! c #71AAEF", +"~ c #7AA1E5", +"^ c #8E8A91", +"/ c #9090A4", +"( c #9795A6", +") c #9398B0", +"_ c #A0A0AA", +"` c #A2A2B1", +"' c #A2A4B1", +"] c #B0ADB9", +"[ c #8698CE", +"{ c #8999CA", +"} c #8FBAF5", +"| c #97B8E7", +" . c #9DBAE9", +".. c #A7B4D1", +"X. c #B4B3C3", +"o. c #B7B7C1", +"O. c #B7B5C8", +"+. c #B9B7C2", +"@. c #B7BAD1", +"#. c #A4BFF2", +"$. c #8CC1F6", +"%. c #8FC9FA", +"&. c #97C6F6", +"*. c #97C7F7", +"=. c #97D0FF", +"-. c #99D7FF", +";. c #99D8FF", +":. c #A1CCF6", +">. c #A4CEF7", +",. c #A4D0F9", +"<. c #A6DDFF", +"1. c #A7DCFF", +"2. c #AADCFF", +"3. c #B9CFF7", +"4. c #BAD1EB", +"5. c #BCD5EC", +"6. c #B5D7FA", +"7. c #B7D7FC", +"8. c #B7D8FD", +"9. c #ACE2FF", +"0. c #C6C6D5", +"q. c #D3D0D8", +"w. c #DBDBE5", +"e. c #DCDBE3", +"r. c #DEDEEA", +"t. c #D3DEF4", +"y. c #C1EEFF", +"u. c #CCE2F6", +"i. c #CAE3FF", +"p. c #C8E7FF", +"a. c #C0F4FF", +"s. c #C8FAFF", +"d. c #CCF9FF", +"f. c #CCFAFF", +"g. c #D8F6FF", +"h. c #DDFDFF", +"j. c #E4E2E7", +"k. c #E2E2EA", +"l. c #E4E4EC", +"z. c #E5E5EF", +"x. c #E3FFFF", +"c. c #E5FFFF", +"v. c #E7FFFF", +"b. c #EBFFFF", +"n. c #ECFFFF", +"m. c #EEFFFF", +"M. c #F6EEF0", +"N. c #F7F5F9", +"B. c #F6F6FF", +"V. c #F4FFFF", +"C. c #F9F7FD", +"Z. c gray100", +"A. c None", +/* pixels */ +"A.5 9 & A.A.A.A.A.A.A.A.A.A.A.A.", +"A.* l.l.7 # A. A.A.A.A.A.A.A.", +"A. _ Z.N.@.G m F M < A.A.A.A.", +"A.A.% q.t.} p.m.V.m.g.N A.A.A.", +"A.A.A.' L &.6.7.>.:.,.2.a A.A.", +" @ 6 | A &.*.! K U I Y z = A.A.", +"o.k.M.J d T %.H c c v k h , A.A.", +"r.Z.Z.Z y p Q ;.E s i l S 2 A.A.", +"& > ^ ~ u g ;.a.9.f k E n 1 A.", +"A.A. ..b 1.s.d.d.$.1.=.R w A.", +"A.A. ] .y.c.c.c.b.x.d.5.t A.", +"A. r C.e.u.7.#.3.i.h.4.O.0.; A.", +"A. w.Z.( 0 ) [ P { D 8 X.B.C ", +"A. : q A.O +.j.V A.$ e / - ", +"A.A.A.A.A.A. ` Z.4 A.A.A. ", +"A.A.A.A.A.A.A.3 B @ A.A.A.A.A.A." +}; --- kdebase-3.5.6.orig/debian/icons/kdeprintfax-16.xpm +++ kdebase-3.5.6/debian/icons/kdeprintfax-16.xpm @@ -0,0 +1,190 @@ +/* XPM */ +static char *kdeprintfax-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 168 2", +" c black", +". c gray2", +"X c gray3", +"o c #111111", +"O c gray7", +"+ c gray9", +"@ c #191919", +"# c gray10", +"$ c #202020", +"% c gray14", +"& c gray15", +"* c #2D292D", +"= c gray20", +"- c #373737", +"; c #3F3F3F", +": c gray28", +"> c #484848", +", c gray29", +"< c #4C4C4C", +"1 c #4E4C4E", +"2 c #505050", +"3 c gray32", +"4 c #5B5B5B", +"5 c #5F5F5F", +"6 c #646464", +"7 c #676767", +"8 c DimGray", +"9 c #6A6A6A", +"0 c #6C6C6C", +"q c #6F6F6F", +"w c gray44", +"e c gray46", +"r c #7EC97C", +"t c #7BA3D9", +"y c #7EA6DB", +"u c #7FA7DB", +"i c #7CA6DD", +"p c #7FA8DC", +"a c gray51", +"s c #898989", +"d c #939393", +"f c #959595", +"g c #989898", +"h c #A7A7A7", +"j c #ACACAC", +"k c gray68", +"l c gray71", +"z c gray72", +"x c #BAB8BA", +"c c gray73", +"v c #BABBBB", +"b c gray74", +"n c gray", +"m c #81A9DE", +"M c #8DADE0", +"N c #A1B6D7", +"B c #A3B8D8", +"V c #A4B8D9", +"C c #A4B9DA", +"Z c #A5B9DA", +"A c #A7BCDF", +"S c #AAB9DA", +"D c #9BD39A", +"F c #ADCDAF", +"G c #B7CDB9", +"H c #B4D2B8", +"J c #BEC1C1", +"K c #BEC2C1", +"L c #A8C4E8", +"P c #E19A9C", +"I c #E1A5A5", +"U c #C3BEC3", +"Y c #C1CBB9", +"T c #C0C0C0", +"R c gray76", +"E c #C3C3C3", +"W c gray77", +"Q c #C5C5C5", +"! c gray78", +"~ c #C7C8C8", +"^ c #C9C7C9", +"/ c #CAC8C5", +"( c #CAC9C6", +") c #CCCAC7", +"_ c #C8C8C8", +"` c #CACACA", +"' c #CBCBCB", +"] c #CBCDCB", +"[ c #CDCBC9", +"{ c #CCCBCB", +"} c #CFCDCA", +"| c gray80", +" . c #CDCCCD", +".. c #CDCDCD", +"X. c #CECECE", +"o. c #CFCECF", +"O. c gray81", +"+. c #C8D3C8", +"@. c #C8D4C8", +"#. c #DFC1C1", +"$. c #D1D0CC", +"%. c #D0D0D0", +"&. c gray82", +"*. c #D3D1D3", +"=. c #D2D2D2", +"-. c #D3D3D2", +";. c gray83", +":. c #D5D5D4", +">. c #D5D5D5", +",. c gray84", +"<. c #D7D7D7", +"1. c #DBD7D7", +"2. c #D8D2D9", +"3. c #D8D5D8", +"4. c #D8D8D8", +"5. c gray85", +"6. c #DBD8DB", +"7. c gray86", +"8. c #DADDDA", +"9. c #DCDBD9", +"0. c #DEDFDE", +"q. c #C7D6EE", +"w. c #E2C6C8", +"e. c #E0DFDF", +"r. c #E1E0DE", +"t. c #E2E1DE", +"y. c #E2E2E2", +"u. c #E4E3E3", +"i. c gray90", +"p. c #E6E5E5", +"a. c #E6E6E6", +"s. c #E7E7E7", +"d. c #E9E9E9", +"f. c #EAE9E9", +"g. c #EBEAE8", +"h. c #EBEAEA", +"j. c gray92", +"k. c #ECECEC", +"l. c #ECEDED", +"z. c gray93", +"x. c #EDEEEE", +"c. c #EEEDED", +"v. c #EEEEED", +"b. c #EEEEEE", +"n. c #EEEFEF", +"m. c #EFEFEF", +"M. c #F0F0EF", +"N. c #F1F1F1", +"B. c #F3F2F0", +"V. c gray95", +"C. c #F2F3F3", +"Z. c #F3F3F2", +"A. c #F3F3F3", +"S. c #F5F4F2", +"D. c #F4F4F4", +"F. c gray96", +"G. c #F7F6F4", +"H. c #F6F6F6", +"J. c gray97", +"K. c #F8F8F8", +"L. c #F9F9F9", +"P. c #FBFAF8", +"I. c gray98", +"U. c #FBFBFB", +"Y. c #FDFDFD", +"T. c #FFFFFE", +"R. c gray100", +"E. c None", +/* pixels */ +"E.E.E.E.E.= z.H.V.C.V.R.d E.E.", +"E.E.E.E.E.5 V.P.P.R.R.R.j . E.E.", +"E.E.E.@ > f M.v.z.V.V.P...: @ E.", +"6 d ; q S.( ( / _ } } $.x U 9 E.", +"=.R.=.1.q.A Z Z Z Z N S G D ] * ", +",.H.{ z.L i m m y y t M H r 8.1 ", +"=.j.! V.R.P.H.M.g.t.t.9.3.2.,., ", +"_ y.E H.H.V.z.j.0.-.-.,.=...=., ", +"Q 1.U B.C.z.j.s.3.,.%.%...{ { < ", +"U } n M.l.i.y.e.6.+...%.{ ! ! 2 ", +"b ! x g.I P Y F 2.%.{ ..' _ W 3 ", +"h x ) e.U w.@.+.;.%._ _ E W g % ", +"s 1.1.X.J J ..! E n z l k 4 o ", +". @ + + X e P.H.z.s.i.n.=.$ E.E.", +"E.E.E.E.E.a R.R.R.P.P.H.i.& E.E.", +"E.E.E.E.E.- q 8 8 7 7 q 7 o E.E." +}; --- kdebase-3.5.6.orig/debian/icons/kdeprintfax.xpm +++ kdebase-3.5.6/debian/icons/kdeprintfax.xpm @@ -0,0 +1,132 @@ +/* XPM */ +static char *kdeprintfax[] = { +/* columns rows colors chars-per-pixel */ +"32 32 94 2", +" c #000000", +". c gray4", +"X c #131313", +"o c #1C1C1C", +"O c #212121", +"+ c gray17", +"@ c #343434", +"# c #3B3B3B", +"$ c #434343", +"% c #4B4B4B", +"& c #545454", +"* c #5E5E5E", +"= c #626262", +"- c gray42", +"; c #717171", +": c #797979", +"> c #286CC6", +", c #3474CB", +"< c #09C709", +"1 c #46BA46", +"2 c #5EBD5C", +"3 c #62BB62", +"4 c #74C274", +"5 c #7FC57E", +"6 c #79DD79", +"7 c #568BD3", +"8 c #DF6363", +"9 c #DD7777", +"0 c #E07474", +"q c gray52", +"w c #8C8C8C", +"e c #949494", +"r c #9C9C9C", +"t c #87BF88", +"y c #95BC95", +"u c #A09F9E", +"i c #A2A2A2", +"p c #ACABAB", +"a c #B4B4B4", +"s c #BCBCBC", +"d c #84A3D6", +"f c #92AEDD", +"g c #96B0DE", +"h c #9EBAE1", +"j c #9CC79B", +"k c #ABC5AB", +"l c #AECCAE", +"z c #BBC8BB", +"x c #B0C7E2", +"c c #B5CBE5", +"v c #B8C7E2", +"b c #BBCDE1", +"n c #B8CFE8", +"m c #BCD2EC", +"M c #DB8383", +"N c #DA8F8F", +"B c #DD9595", +"V c #DE9999", +"C c #DDA0A0", +"Z c #DCBABA", +"A c #C3C3C3", +"S c #C7CFC7", +"D c #CACACA", +"F c #CED0D3", +"G c #CED1D8", +"H c #DEC3C3", +"J c #D3D3D3", +"K c #D2D5DB", +"L c #D5D8DF", +"P c #DFD2D2", +"I c #D9D6D9", +"U c #DBDADB", +"Y c #D6D9E0", +"T c #D9DBE1", +"R c #DEE3E3", +"E c #E3DADA", +"W c #E4E1DD", +"Q c #E4E4E4", +"! c #E4E5EC", +"~ c #E7E8E8", +"^ c #E9E6E2", +"/ c #EDE9E5", +"( c #EBEBEB", +") c #E4EDF7", +"_ c #E8ECF3", +"` c #ECF2F2", +"' c #F2EEEB", +"] c #F4F1ED", +"[ c #F2F2F2", +"{ c #F5F7FB", +"} c #F9F6F2", +"| c #FCF9F5", +" . c #FCFCFC", +".. c None", +/* pixels */ +"......................& ] ( ( ( ~ ~ ~ ( ~ ~ ^ ~ E $ ............", +"......................& . . . . . . . . . . . .[ @ ............", +"......................= .{ { { . . . . . . . .` # ..........", +"....................& p ( ] } } } { . . . . . .~ r @ ..........", +"....................* A ~ ( ( ( ( ( ( ] ] ` [ { Q s % ..........", +"..............# ; % : A Q Q ~ ^ ~ ~ ( ( ( ( ( ] E s = @ = ....", +"..% * @ ....: { [ I D ~ ^ Q ~ ( ~ ( ( _ ] ] { Q A s a r . ....", +"+ A I D = ; - r . .D u p p p p p p p p p p p p i r s I s @ ....", +"e . . .J W s ~ { _ ! Y U Y L L L K K K G G G F K D z U Q z + ..", +"r . . .F z a .v d f f f f f f f f f g g f f g U 5 6 4 J Q : ", +"r . .{ D s D .h > , , , , , , , , , , , , , 7 T 2 < 1 I Q w ", +"r .} [ D s I .) m K n m m m n n c c c c c x b E L k S I I q ", +"r .` ( D s I . . . .| | | | } ] ] / / ^ ^ W W U U U I J J q ", +"u } ( ~ A s ~ . .{ { [ [ [ ( ( ( R J U W I J I I J F D J J w ", +"u ` Q ~ A s Q .{ { [ ] ] ` ( ~ ( J F J J D I F J D U D D D w ", +"i ! Q E A s ( .{ [ ] ` ( ( ~ ~ Q W J J U J D J I D D D D D w ", +"i ~ U I s s ( { } ] ` ( ( ( Q ! Q F D I J S J D D D U A D S w . ", +"i E I J s A ( } ` ( ` ( ~ ~ Q Q R U D J I D J J J D D A A A w ", +"i U J J s s ( ] ( ` ( ~ Q Q Q E W J D I J D F F D D J A A A w . ", +"i J F D a A ( ` ( ^ ~ E Q Q U U U J J J D A I D D A P A A A w X ", +"i F D D a A ~ ` E B E N E U y J U F S D J D A D D D A s s s w X ", +"i D A z a s ~ ` 9 0 M 8 ! t 3 U I S J I A A U D A D U A s s w X ", +"i D A s p A G ( V H V Z Q j l I J J D J D D D D A A A A s i ; ", +"= a p i s ~ A D R Q R R I U I J J D D D D A A A A A s a r ; O ", +"& Q F F ~ [ ( I D A I J J J J J J D D D S A Z s p u e : $ . ..", +"+ U ] ~ E U L J D s p p s z s s s a a p p i r i p p % ....", +" X O O O O o o o o @ s ( ._ ~ R U U J T R ( _ ] D # ..........", +"....................+ A [ . . . . . . .{ { ` ] ( F $ ..........", +"....................+ F } . . .{ } [ ] ] ( ( ~ ~ L $ ..........", +"....................+ E ( ` ( ( ] ( ( ( ( ( Q Q Q ] % ..........", +"....................o s F A D A A D D A A D D A D D @ ..........", +".................... . . . . . .........." +}; --- kdebase-3.5.6.orig/debian/icons/kfm.xpm +++ kdebase-3.5.6/debian/icons/kfm.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *kfm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c black", +". c #000015", +"X c #000024", +"o c #03062E", +"O c #00003B", +"+ c #050E33", +"@ c #01024C", +"# c #050C42", +"$ c #000055", +"% c #00015B", +"& c #091749", +"* c #081657", +"= c #0A1B59", +"- c #000063", +"; c #00006D", +": c #050D6E", +"> c #000172", +", c #040B7A", +"< c #040973", +"1 c #09186D", +"2 c #081462", +"3 c #07117F", +"4 c #08127A", +"5 c #091874", +"6 c #0E256C", +"7 c #0E2778", +"8 c #091381", +"9 c #0B1985", +"0 c #0A1D89", +"q c #0E2485", +"w c #0F298E", +"e c #0D2389", +"r c #0F2891", +"t c #14288F", +"y c #13218E", +"u c #142A97", +"i c #13328D", +"p c #123299", +"a c #163B9A", +"s c #19339C", +"d c #1636AB", +"f c #1538AF", +"g c #1F36A3", +"h c #1836AA", +"j c #1B3FA4", +"k c #153AA2", +"l c #282F8E", +"z c #283B99", +"x c #213FA8", +"c c #1742A7", +"v c #1943A6", +"b c #1B46A8", +"n c #1D4BAB", +"m c #1742AE", +"M c #1B47B8", +"N c #1E51B1", +"B c #34419A", +"V c #2743AB", +"C c #2249AB", +"Z c #2D4BAC", +"A c #2245A6", +"S c #2B4FBB", +"D c #294AB5", +"F c #2C50AF", +"G c #2055B2", +"H c #2259B6", +"J c #235CB9", +"K c #2858B6", +"L c #2C59B8", +"P c #354AA1", +"I c #304BB3", +"U c #3252B3", +"Y c #395CB4", +"T c #345ABB", +"R c #2560BC", +"E c #3462BB", +"W c #3D62B8", +"Q c #1B57C3", +"! c #1D50D7", +"~ c #1F61CA", +"^ c #2054C1", +"/ c #2353D4", +"( c #3058C2", +") c #2057E0", +"_ c #2463C5", +"` c #276DCF", +"' c #2C66C0", +"] c #2669D2", +"[ c #2C65D9", +"{ c #2C76DB", +"} c #3C64C1", +"| c #3C6FC4", +" . c #3465D6", +".. c #3C6AD4", +"X. c #396BD8", +"o. c #3D74D5", +"O. c #3978DB", +"+. c #2F6DE5", +"@. c #2578EB", +"#. c #336FEB", +"$. c #386FE5", +"%. c #316FE4", +"&. c #346EF0", +"*. c #3571E2", +"=. c #3874E4", +"-. c #3C7AE5", +";. c #3E79ED", +":. c #3577EA", +">. c #3979FE", +",. c #2969F8", +"<. c #435EB2", +"1. c #4567BF", +"2. c #446BBD", +"3. c #4768B7", +"4. c #5061AD", +"5. c #5C6AB6", +"6. c #5171BC", +"7. c #6C7DBF", +"8. c #4469C4", +"9. c #4C78C8", +"0. c #4378D9", +"q. c #547AC4", +"w. c #5378C4", +"e. c #407DE5", +"r. c #437EEA", +"t. c #407FFE", +"y. c #2E81EE", +"u. c #3785E7", +"i. c #3D8CED", +"p. c #3589F5", +"a. c #398BF4", +"s. c #3C93FD", +"d. c #4781D7", +"f. c #4D85DB", +"g. c #4C8ADA", +"h. c #5381CB", +"j. c #5B8ED3", +"k. c #568BD9", +"l. c #5E95DB", +"z. c #4582E5", +"x. c #4A83EA", +"c. c #4A88E7", +"v. c #4582FE", +"b. c #4987FE", +"n. c #4C8AFE", +"m. c #4196FD", +"M. c #4599FE", +"N. c #4B9DFD", +"B. c #548AEA", +"V. c #528EFE", +"C. c #5A93E9", +"Z. c #5C98EE", +"A. c #5492FE", +"S. c #5995FD", +"D. c #5D99FE", +"F. c #5E99F5", +"G. c #4EA0FE", +"H. c #53A3FD", +"J. c #5AA3FE", +"K. c #5CA9FE", +"L. c #6489CA", +"P. c #6A88C7", +"I. c #6C8FCE", +"U. c #648ED0", +"Y. c #6F90D0", +"T. c #7A8DC8", +"R. c #738FCA", +"E. c #7793CC", +"W. c #7B9DD5", +"Q. c #6197E6", +"!. c #639BE7", +"~. c #619EFE", +"^. c #6D9FFE", +"/. c #6CAAEA", +"(. c #65A1FE", +"). c #62ADFE", +"_. c #6AA5FE", +"`. c #6EA9FE", +"'. c #65B0FE", +"]. c #6BB4FE", +"[. c #74AEEC", +"{. c #7AACEE", +"}. c #76A4E9", +"|. c #73ADFE", +" X c #7AAFFE", +".X c #71ABF3", +"XX c #74B2EA", +"oX c #7CB6EC", +"OX c #7CB9ED", +"+X c #73B4FE", +"@X c #73BAFF", +"#X c #7AB5FF", +"$X c #79BBFE", +"%X c #7CC0FF", +"&X c #8E95C7", +"*X c #8A9DD0", +"=X c #85A8DA", +"-X c #99ABD9", +";X c #84ABF0", +":X c #84BBEB", +">X c #8CBAE7", +",X c #82B4FE", +".,.8 ", +"YXH :.>.t.,XaX$X%X6X6X6X8X8X6X6X6X5X$X$X@X].#X_.A.&.D D ) , ", +"YXG :.v.b.b.^.lXeX6X8XeXeXeXeX8X6X6X5X$X5X|.V.$.( 7.gX5.! , ", +"YXG ;.b.n.V.A.D.jXsXrXrXtXtXtXrXeXeXiX+XA.X.} *XMX1X:.f ! , ", +"YXN r.V.A.S.S.D.D.wXBXpXxXxXpXsXwX XS.o.w.-XMX;X-.=.%.d / < ", +"YXN x.S.S.D.D.D.~.~.,XDXvXvXiX|.F.o.Y.fXkX{.c.0.e.-.*.h / > ", +"YXn c.D.~.~.(._._._.`.|.LX,XZ.d.W.MXkXXX/.0.n 8 z.e.=.u [ > ", +"YXn B.(._._.`.`.|.|.|.|.lX+Xh.SXzXOXXX/.' k u T 0.S g S r.> ", +"YXn B.`.`.|.|.|.+X#X#X#XlX#Xh.kX3XOXoX/.E 9.k.U V V 5.5. .> ", +"YXv B.|.|.+X#X#X#X,XX:XXXj.T Z U T.MX;XI .> ", +"YXv C.#X#X,X ", +"YXv Q.#X ", +"YXk Q. ", +"YXa L .X7X8XqXqXrXrXrXrXZXtXj.=XFXzXoX/.g.K w 9 z.e.D g 0.> ", +"YX i C !.qXrXrXtXtXpXpXDXpXh.AX3XoXXX/.n A } k.V U 8.s > $ ", +"YX 7 a q.rXpXsXsXxXcXHXcXq.BX4X:XoXXXl.l.I 1.8.y ; $ . ", +"YXYX = w Y wXxXcXvXvXJXvX6.AX0X9X:Xj.Y q.8.4 ; @ ", +"YXYXYX + q z >XvXZXZXKXDX6.FXyXL.6.U.<., ; O YXYX", +"YXYXYXYX 5 t E.DXJXPXJX<.T.P.=XB > % O YXYXYXYX", +"YXYXYXYXYXYX 2 9 4.SXUXPXgX=XB ; - X YXYXYXYXYXYX", +"YXYXYXYXYXYXYX # 4 z 2X&Xl < % . YXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYX o : , : @ YXYXYXYXYXYXYXYXYXYX" +}; --- kdebase-3.5.6.orig/debian/icons/kdeprint-16.xpm +++ kdebase-3.5.6/debian/icons/kdeprint-16.xpm @@ -0,0 +1,159 @@ +/* XPM */ +static char *kdeprint-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 137 2", +" c black", +". c gray5", +"X c #252525", +"o c #313131", +"O c #323232", +"+ c #333335", +"@ c #464646", +"# c #4D4D4F", +"$ c #545455", +"% c #555556", +"& c #56565B", +"* c #59595B", +"= c #58585D", +"- c #5A5A62", +"; c #5C5C68", +": c #606065", +"> c #6C6C6E", +", c #6F6F74", +"< c #707073", +"1 c #76767E", +"2 c #7C7C80", +"3 c #7F7F84", +"4 c #008CFD", +"5 c #008EFF", +"6 c #239EFF", +"7 c #498ADF", +"8 c #538FDE", +"9 c #40A1ED", +"0 c #4BB5FD", +"q c #51B8FD", +"w c #6699DE", +"e c #6A9CDE", +"r c #7EA7DF", +"t c #76C7FD", +"y c #84848C", +"u c #878792", +"i c #898990", +"p c #898993", +"a c #93939E", +"s c #8B9AB2", +"d c #9999A7", +"f c #9A9AA6", +"g c #90A3BF", +"h c #A3A3AB", +"j c #A0A0AC", +"k c #A6A6AD", +"l c #A3A3B2", +"z c #A9A9B2", +"x c #AFAFB6", +"c c #AFAFB7", +"v c #A5BABC", +"b c #B0B0B7", +"n c #B1B1B6", +"m c #B1B1B9", +"M c #B4B4BD", +"N c #83A9DE", +"B c #8FB1D3", +"V c #8BB2DA", +"C c #9BB6DE", +"Z c #9EB7DF", +"A c #B3B3C1", +"S c #B3B3C2", +"D c #B1B1C5", +"F c #B9B9C0", +"G c #B9B9C4", +"H c #BEBECA", +"J c #BDBDCE", +"K c #8BCDFC", +"L c #A8C2E4", +"P c #A9C3E6", +"I c #AAC3E5", +"U c #ACC7E7", +"Y c #ADC7E7", +"T c #AFC9E8", +"R c #B9D5F0", +"E c #C0C0C9", +"W c #C7C7CE", +"Q c #C0C5D7", +"! c #C4C6D7", +"~ c #C8C8D2", +"^ c #CACAD6", +"/ c #CBCBD6", +"( c #CACDD4", +") c #CDCDDA", +"_ c #CFD4DC", +"` c #D0D0D1", +"' c #D2D2D2", +"] c #D0D0DC", +"[ c #D5D5DB", +"{ c #D5D5DE", +"} c #D6D6E1", +"| c #D7D7E0", +" . c #D8D8E2", +".. c #DADAE3", +"X. c #DBDBE3", +"o. c #DDDDE2", +"O. c #DFDFE6", +"+. c #C9E5F9", +"@. c #CBE6FA", +"#. c #CEE8FA", +"$. c #D5EBFB", +"%. c #DBEEFB", +"&. c #DCEEFB", +"*. c #E0E1E7", +"=. c #E1E1E9", +"-. c #E2E2E8", +";. c #E3E3E9", +":. c #E2E2EA", +">. c #E3E3EB", +",. c #E4E4E8", +"<. c #E4E4E9", +"1. c #E5E5EB", +"2. c #E6E6EB", +"3. c #E6E6EC", +"4. c #E8E8EC", +"5. c #E9E9EE", +"6. c #E2E8F1", +"7. c #EBEBF0", +"8. c #E9ECF3", +"9. c #EBEFF6", +"0. c #ECECF0", +"q. c #ECF2F8", +"w. c #F4F4F7", +"e. c #F0F5FA", +"r. c #F1F5FA", +"t. c #F2F6FA", +"y. c #F6F6F8", +"u. c #F5F9FB", +"i. c #F6F8FC", +"p. c #F8FBFD", +"a. c #FBFBFC", +"s. c #F9FCFD", +"d. c #FAFCFD", +"f. c #FCFCFD", +"g. c #FEFFFF", +"h. c gray100", +"j. c None", +/* pixels */ +"j.j.j.j.A =.;.;.;.;.*.f j.j.j.j.", +"j.j.j.j.H h.h.h.h.d.d.j j.j.j.j.", +"j.j.j.j.G h.h.h.d.u.i.f j.j.j.j.", +"j.j.j.j.M h.h.h.u.q.u.a j.j.j.j.", +"j.j.j.j.z h.d.u.t.9.9.p j.j.j.j.", +"j.@ # m x d.u.q.q.6.8.k c @ O j.", +"% | =.=.g T Y Y P P P s | | ~ O ", +"F 3.3.,.R &.&.$.#.@.@.V ) v ) 3 ", +"{ 5.3.( K t q 0 0 0 0 9 | . .b ", +"k ,.3.B 6 5 5 5 5 5 5 5 { 2...i ", +"u D D Q C r w 7 8 e N Z ! D D 1 ", +"y J A = & & & & & & & & : J J , ", +"2 ) H < ' ' ' ' ' ' ' ( > ^ ) * ", +"% W =.{ h.h.h.h.h.h.h.h.( *.x X ", +"j.. - w.h.h.h.h.h.h.d.y.o.+ j.", +"j.j.l 4.0.5.5.0.5.4.4.,.o.; j.j." +}; --- kdebase-3.5.6.orig/debian/icons/kappfinder.xpm +++ kdebase-3.5.6/debian/icons/kappfinder.xpm @@ -0,0 +1,245 @@ +/* XPM */ +static char *kappfinder[] = { +/* columns rows colors chars-per-pixel */ +"32 32 207 2", +" c black", +". c #635B67", +"X c #0032A4", +"o c #053AA9", +"O c #083FAD", +"+ c #0234C7", +"@ c #0336E3", +"# c #0941AE", +"$ c #0A44B0", +"% c #0E4AB3", +"& c #104EB6", +"* c #1353BA", +"= c #1759BE", +"- c #185BBF", +"; c #29448D", +": c #195EC1", +"> c #0349FF", +", c #0A4FFF", +"< c #0D53FF", +"1 c #1157FF", +"2 c #145AFF", +"3 c #195FFF", +"4 c #1D64C5", +"5 c #1F68C8", +"6 c #1C62FF", +"7 c #226CCA", +"8 c #2572CE", +"9 c #2775D0", +"0 c #297AD3", +"q c #2166FF", +"w c #2368FF", +"e c #286EFF", +"r c #2B70FF", +"t c #3174FE", +"y c #357BFF", +"u c #3A7FFF", +"i c #666685", +"p c #757793", +"a c #787793", +"s c #7B7B96", +"d c #2E82D9", +"f c #3186DB", +"g c #338BDE", +"h c #368FE1", +"j c #3D82FF", +"k c #3894E4", +"l c #7F8AA7", +"z c #5D99DD", +"x c #4187FF", +"c c #4489FF", +"v c #498EFF", +"b c #4E93FF", +"n c #5A8EF9", +"m c #5196FF", +"M c #559AFF", +"N c #589DFF", +"B c #4AA1EB", +"V c #5EA3FF", +"C c #609CDF", +"Z c #609EE0", +"A c #63A3E3", +"S c #66A8E6", +"D c #65ABE9", +"F c #69ADE9", +"G c #65A9FF", +"H c #6AAEFF", +"J c #6DB1FF", +"K c #71B5FF", +"L c #76BAFF", +"P c #78BCFF", +"I c #7DC2FD", +"U c #8A5D38", +"Y c #955E28", +"T c #9B6428", +"R c #A26929", +"E c #A96F2A", +"W c #AD7026", +"Q c #AD7129", +"! c #B47526", +"~ c #B17529", +"^ c #B6792A", +"/ c #BB7B27", +"( c #BC7D29", +") c #A27447", +"_ c #A2774C", +"` c #DF951E", +"' c #C28027", +"] c #C3832A", +"[ c #C98628", +"{ c #CC892A", +"} c #C98A30", +"| c #D18C29", +" . c #E0971F", +".. c #E39A21", +"X. c #C89246", +"o. c #D39B43", +"O. c #D09849", +"+. c #D9A863", +"@. c #E3AF4B", +"#. c #F1BB56", +"$. c #F1BC59", +"%. c #F3C75F", +"&. c #EDC565", +"*. c #E9C071", +"=. c #F0C661", +"-. c #868296", +";. c #82869E", +":. c #8989A2", +">. c #8590AD", +",. c #8D99AE", +"<. c #8499B4", +"1. c #938FA1", +"2. c #9394AB", +"3. c #999EB2", +"4. c #A7A7BB", +"5. c #ABAABC", +"6. c #8FAED0", +"7. c #99A9C7", +"8. c #A4B1C2", +"9. c #A8B5C4", +"0. c #A4B5D0", +"q. c #A7B8D4", +"w. c #ACBCD7", +"e. c #B2B2C3", +"r. c #BBBBCB", +"t. c #A5B7E6", +"y. c #AFBBEB", +"u. c #86C4F6", +"i. c #82C6FF", +"p. c #89C7F7", +"a. c #88CCFF", +"s. c #95C1EB", +"d. c #98C4EF", +"f. c #9ECCEF", +"g. c #95CDF3", +"h. c #91CDF8", +"j. c #96D1F8", +"k. c #99D4F8", +"l. c #9ED8F9", +"z. c #A0C5D8", +"x. c #ADC2D4", +"c. c #B0C1CE", +"v. c #B0C5D1", +"b. c #B1CAD5", +"n. c #BBC9DD", +"m. c #A6C3E7", +"M. c #A0CEE7", +"N. c #A9C6E9", +"B. c #A9CEE9", +"V. c #ADD1E6", +"C. c #A0D6F4", +"Z. c #A3DCFA", +"A. c #B5C7F5", +"S. c #BCCEF0", +"D. c #BACCFB", +"F. c #BED0FE", +"G. c #A7E0FA", +"H. c #ABE3FA", +"J. c #BAE7EF", +"K. c #B0E7FB", +"L. c #B3EAFC", +"P. c #BAE9F4", +"I. c #BBEFFD", +"U. c #BDF2FD", +"Y. c #D8BB84", +"T. c #C2BEC4", +"R. c #F8DB96", +"E. c #F8DD99", +"W. c #FEF3BD", +"Q. c #C0C0CE", +"!. c #CCC7CD", +"~. c #CEC9CF", +"^. c #C3C5D2", +"/. c #CACAD5", +"(. c #CECDD9", +"). c #D1CFDB", +"_. c #D5D4DE", +"`. c #C4CCE1", +"'. c #C3D2E6", +"]. c #C2D3E8", +"[. c #CBD3E9", +"{. c #CFDBE2", +"}. c #CEDFFC", +"|. c #D6D5E0", +" X c #D8D7E0", +".X c #DCDCE4", +"XX c #C2F5FD", +"oX c #C6FAFE", +"OX c #CCF1F4", +"+X c #CAF5FD", +"@X c #CBFCFE", +"#X c #D8EBEF", +"$X c #D4E5FF", +"%X c #DAECFF", +"&X c #D3FEFE", +"*X c #DFF0FF", +"=X c #DBFEFF", +"-X c #E4E3EB", +";X c #E9E9EE", +":X c #EDEDF1", +">X c #E3FFFF", +",X c #EBFEFE", +" > > > + X 4X4X4X4X4X4X", +"B a.i.I L J H G V M b c j u t e q 3 1 , > > > > @ X 4X4X4X4X4X4X", +"B i.I P J J G G N m b x j y n t 6 2 1 , > > > > @ X 4X4X4X4X4X4X", +"D >X%X%X%X%X$X$X$X$X}.S.[.'.'.'.`.t.A.F.D.D.D.D.y.X 4X4X4X4X4X4X", +"F 3X3X3X3X3X3X3X3X;X'.d.u.h.j.k.j.f.n._.1X1X1X1X-XX 4X4X4X4X4X4X", +"F 3X3X3X3X3X3X3X;XN.p.k.l.Z.G.H.H.L.Z.B./.XU.+X&X&X&X&X&X&Xb.(._.X 4X4X4X4X4X4X", +"A 3X3X3X3X;Xw.l.Z.H.L.+X+XXXoX>X&X=X&X=X=X=Xx.r._.X 4X4X4X4X4X4X", +"A 3X3X3X3X;X0.l.G.L.L.H.L.XX=X>X=X=X>X>X>X=Xc.r._.X 4X4X4X4X4X4X", +"A 3X3X3X3X3X7.j.G.Z.L.oX+X=X=X=X=X>X,X,X,X,X9.).).X 4X4X4X4X4X4X", +"A 3X3X3X3X3X5.g.H.G.G.L.U.@X&X=X>X,X2X2X2X,X;..X).X 4X4X4X4X4X4X", +"A 3X3X3X3X3X/.6.G.L.G.L.XX@X&X>X>X,X2X3X2X{.2.-X(.X 4X4X4X4X4X4X", +"A 3X3X3X3X3X1X2.g.L.L.L.XX@X&X=X>X,X2X3X3Xl e.-X(.X 4X4X4X4X4X4X", +"C 3X3X3X3X3X3X_.>.l.U.U.U.@X&X=X>X,X,X2X3.:.:.-X(.X 4X4X4X4X4X4X", +"z 3X3X3X3X3X1X3X/.l f.U.@X@X@X=X=X>X#X:.:.2.5.!.+.; 4X4X4X4X4X4X", +"C 3X3X3X3X1X1X1X1X.X:.<.z.J.@XOXb.,.a 5.2.e.T.O...} | 4X4X4X4X4X", +"z 1X1X c #092D67", +", c #004600", +"< c #055900", +"1 c #0F5003", +"2 c #166113", +"3 c #225F22", +"4 c #30792D", +"5 c #032684", +"6 c #002097", +"7 c #002492", +"8 c #0B3A8C", +"9 c #073291", +"0 c #05339F", +"q c #0A2EA0", +"w c #012DB4", +"e c #0028C6", +"r c #0231C2", +"t c #0339E7", +"y c #0035FE", +"u c #093FFE", +"i c #0B40BC", +"p c #0E49B1", +"a c #2254AD", +"s c #1759C4", +"d c #175FC0", +"f c #1954D0", +"g c #0840F3", +"h c #0F4CFE", +"j c #1958E2", +"k c #1654FE", +"l c #385FD8", +"z c #255BF9", +"x c #296DD5", +"c c #2277D5", +"v c #2574D4", +"b c #396DDA", +"n c #3178D1", +"m c #2467F6", +"M c #337BE9", +"N c #3075FE", +"B c #387DFE", +"V c #487DC6", +"C c #417BFC", +"Z c #168404", +"A c #2A8C19", +"S c #3F8B34", +"D c #39AE1D", +"F c #469F35", +"G c #56B03E", +"H c #578D58", +"J c #65C04C", +"K c #2D86DF", +"L c #3A89E1", +"P c #3E89F2", +"I c #799F81", +"U c #7F9F9A", +"Y c #4E91DD", +"T c #4783E4", +"R c #4598EC", +"E c #4B92ED", +"W c #5380FD", +"Q c #5096E0", +"! c #539AE2", +"~ c #5596FE", +"^ c #529BFC", +"/ c #4BA0EE", +"( c #5CA7FE", +") c #5DAEF6", +"_ c #6B98D7", +"` c #6D9CFE", +"' c #69AFEE", +"] c #75B8FE", +"[ c #83C872", +"{ c #8CA6D7", +"} c #89BDED", +"| c #89BEEE", +" . c #87B8FE", +".. c #A2B0D7", +"X. c #95C28F", +"o. c #A6C2A9", +"O. c #B0CEAF", +"+. c #B7D8B1", +"@. c #8CC6FE", +"#. c #B5C9E8", +"$. c #B9D7FE", +"%. c #DDF0D8", +"&. c #D5E0F1", +"*. c #DDE7FE", +"=. c #DDEDFE", +"-. c #E3E3ED", +";. c #E3E8F9", +":. c #E3EDFE", +">. c #E8E8F1", +",. c #EDEDF3", +"<. c #EEEEF5", +"1. c #F0F9ED", +"2. c #F1F1F6", +"3. c #F2F2F7", +"4. c #F3F3F7", +"5. c #F6F6F8", +"6. c #F6F6F9", +"7. c #F7F7F9", +"8. c #F8F8FB", +"9. c #F9F9FB", +"0. c #F9F9FC", +"q. c #FBFBFC", +"w. c #FCFCFD", +"e. c #FDFDFD", +"r. c #FDFDFE", +"t. c #FEFEFE", +"y. c None", +/* pixels */ +"y.y.y.y.y.y.y.0 w 6 5 7 = ", +"y.y.y.y.y.p i t y q 9 r e - ", +"y.y.y.d s j h z b f g u l * ", +"y.c v M N C T x m k W ;...& @ + ", +"K R ^ ~ E L P B ` *.8.4.U % , # ", +"/ ] $.| ) ( .:.t.q.O.4 < 2 H O ", +"! t.t.' @.=.t.t.%.F Z A X.8.I o ", +"! t.t.| t.t.t.t.J D [ t.t.4.I o ", +"! e.q.@.t.t.t.t.J 1.t.t.6.<.I o ", +"! e.e.! t.t.t.9.J t.t.q.3.>.I o ", +"! e.t.Y t.t.t.5.J t.t.6.<.-.I o ", +"! e.q.Y t.t.9.5.J t.q.<.o.3 . ", +"! e.&.n t.t.6.{ J t.+.S $ ", +"! _ 8 n t.#.a = J G 1 ", +"! X n V > J y.", +" : y.y.y." +}; --- kdebase-3.5.6.orig/debian/icons/kdeprint.xpm +++ kdebase-3.5.6/debian/icons/kdeprint.xpm @@ -0,0 +1,168 @@ +/* XPM */ +static char *kdeprint[] = { +/* columns rows colors chars-per-pixel */ +"32 32 130 2", +" c black", +". c gray5", +"X c #131313", +"o c #2F2F2F", +"O c #343434", +"+ c #3B3B3B", +"@ c #3F3F49", +"# c #434343", +"$ c #4A4A4A", +"% c #525252", +"& c #5B5B5C", +"* c #5D5D60", +"= c #5D5D6B", +"- c #616162", +"; c #6D6D72", +": c #767676", +"> c #7C7C7E", +", c #036DFA", +"< c #0A6EF3", +"1 c #007CFF", +"2 c #1370ED", +"3 c #1C73E8", +"4 c #2075E6", +"5 c #2B79E1", +"6 c #757587", +"7 c #7D7D86", +"8 c #7B7B8E", +"9 c #0186F5", +"0 c #008EFF", +"q c #198AE3", +"w c #1687FF", +"e c #1698FF", +"r c #14A0FE", +"t c #3B81DF", +"y c #3FB2FE", +"u c #678EB5", +"i c #7587A0", +"p c #428BCB", +"a c #4285DF", +"s c #4E8DD6", +"d c #538FE0", +"f c #5B94E1", +"g c #4BB5FD", +"h c #6C9AC7", +"j c #6EA0E3", +"k c #60B9FF", +"l c #76A4E3", +"z c #6BC3FD", +"x c #7CC0F4", +"c c #838388", +"v c #8A8A8F", +"b c #838392", +"n c #86869B", +"m c #8F8F91", +"M c #949497", +"N c #93939A", +"B c #99999C", +"V c #8C8CA1", +"C c #8A98A7", +"Z c #9494A3", +"A c #9595AB", +"S c #9A9AA6", +"D c #9D9DAA", +"F c #9B9BB0", +"G c #80A4A0", +"H c #91B8AD", +"J c #A5A5AC", +"K c #A9A9AB", +"L c #A6A6B0", +"P c #A8A8B2", +"I c #ADADB8", +"U c #A7B2BF", +"Y c #B3B3BC", +"T c #BEBEBF", +"R c #87A5C7", +"E c #85B6E2", +"W c #A2B3C9", +"Q c #B2B2C4", +"! c #B5B5C8", +"~ c #B4BDC7", +"^ c #BCBCC5", +"/ c #BCBCCC", +"( c #86CCFB", +") c #8ACEFC", +"_ c #94D3FD", +"` c #B7C5C9", +"' c #AAC2E3", +"] c #A4D9FC", +"[ c #B7CDE9", +"{ c #BACFE9", +"} c #BDD1EB", +"| c #B2DEFC", +" . c #B6E0FD", +".. c #C3C3C3", +"X. c #C4C4CE", +"o. c #CACACC", +"O. c #C4C4D2", +"+. c #CACAD5", +"@. c #CDCDD9", +"#. c #D0D0D6", +"$. c #D3D3DC", +"%. c #DBDBDC", +"&. c #C5D2E7", +"*. c #C3D4EB", +"=. c #C7D9EE", +"-. c #CCD4E4", +";. c #CBDAEE", +":. c #D6D6E1", +">. c #DBDBE3", +",. c #DDDFE8", +"<. c #D1DEF0", +"1. c #CBE6FA", +"2. c #CFE8FA", +"3. c #DEE4ED", +"4. c #D3E0F0", +"5. c #D3EAFA", +"6. c #DAE5F3", +"7. c #DBEEFB", +"8. c #E0E0E4", +"9. c #E3E3EA", +"0. c #E9E9EE", +"q. c #E3EAF3", +"w. c #ECECF1", +"e. c #EAF1F7", +"r. c #EDF3F8", +"t. c #F1F2F5", +"y. c #F3F5F9", +"u. c #F5F8FB", +"i. c #FDFDFE", +"p. c None", +/* pixels */ +"p.p.p.p.p.p.p.p.F Q / / / / / / / / / / / / D p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.i.i.i./ p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.u.y.i./ p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.Z ,.i.i.i.i.i.i.i.i.u.u.y.i.^ p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.n 8.i.i.i.i.i.i.u.u.y.y.r.i.! p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.n ,.i.i.i.i.i.u.u.u.y.r.e.u.Y p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.8 ,.i.i.i.i.i.u.u.y.r.r.e.u.Y p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.8 %.i.i.i.i.u.u.y.r.r.e.q.u.I p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.6 %.i.i.i.u.u.u.r.r.e.q.q.y.P p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.$ * $.i.u.u.u.r.r.r.e.q.q.3.y.L + p.p.p.p.p.p.p.p.", +"p.p.p.p.p.$ $ $ v $.i.u.u.r.r.e.e.q.q.3.3.w.P : # $ $ p.p.p.p.p.", +"p.p.$ $ > Y +.:.M $.u.y.y.r.r.e.q.q.3.3.,.y.D o.$.O.J ; # $ p.p.", +"p.$ J ,.,.9.,.9.v #.y.q.6.4.=.} { } &.-.-.w.D ..9.,.3.3.%.> o p.", +"$ ; 9.,.9.9.9.0.i [ } *.;.4.6.6.6.3.<.=.*.} ' K $.#.$.%.:.:.# ", +"$ #.0.0.9.9.0.0.R 7.7.7.7.7.7.7.7.5.5.5.1.1.1.C @.@.` H @.@.c X ", +"$ 0.0.0.0.0.0.%.E . . . . .] _ ( ( ( ( ( ( ( u >.:.` i :.$.^ O ", +"$ w.w.w.w.0.8.o.x _ _ ) z g g g g g g g g g g p 9.>.%.%.:.:.#.O ", +"* w.w.w.0.8.>.U z z y e r r r e e r r r e e r q %.3.3.>.>.,.>.+ ", +"* 0.t.0.9.9.,.h z e 0 0 0 0 0 0 0 0 0 0 0 0 0 9 #.8.9.9.0.9.o.# ", +"& Q / >.w.w.w.s w 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 W 0.0.0.@.! Z # ", +"* Q Q Q Q / :.' j d t 5 3 2 < , , < 2 4 5 a f l -.+.! Q Q Q D @ ", +"% ! ! ! ! Q Q ! ! ! ` +.@.@.:.,.>.%.@.+.@.` ! ! ! ! ! ! ! ! Z O ", +"% Q / / / Q 7 7 7 7 7 7 7 7 c 7 7 7 7 7 7 7 7 7 8 b / / / / N O ", +"% I O.O.O.L + + + + + @ + + + + + + + + + + + + + % O.O.O.O.m o ", +"% L @.@.@.P $ % ..............................K $ * o.@.@.@.7 X ", +"& b :.:.:.^ M K %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.c B #.:.:.$.& ", +"p.* >.9.9.9.@.9.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.O.,.9.9.9.Y # ", +"p.% M #.9.9./ i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.0./ 9.$.T ; . p.", +"p.p.. # $ * +.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.i.Z $ # X p.", +"p.p.p.p.p.A t.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.w.t.X.@ p.p.p.p.p.", +"p.p.p.p.p.Y i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.y.u.y.= p.p.p.p.p.", +"p.p.p.p.F Q @.@.@.@.@.@.@.@.@.@.@.@.@.X.X./ ..^ Y Y ; p.p.p.p." +}; --- kdebase-3.5.6.orig/debian/icons/kwrite-16.xpm +++ kdebase-3.5.6/debian/icons/kwrite-16.xpm @@ -0,0 +1,185 @@ +/* XPM */ +static char *kwrite-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 163 2", +" c black", +". c #000002", +"X c #050300", +"o c #070500", +"O c #080500", +"+ c #00031A", +"@ c #00071B", +"# c #00061C", +"$ c #00081F", +"% c #191603", +"& c #1D160E", +"* c #1F190E", +"= c #000C3B", +"- c #372F05", +"; c #06184E", +": c #01165C", +"> c #01185E", +", c #061A5C", +"< c #000F60", +"1 c #001B6C", +"2 c #503C20", +"3 c #52470F", +"4 c #60540D", +"5 c #67590B", +"6 c #7A4A2E", +"7 c #485872", +"8 c #586265", +"9 c #596265", +"0 c #5C6564", +"q c #616961", +"w c #626961", +"e c #0028A6", +"r c #002BA7", +"t c #012CA8", +"y c #022CA9", +"u c #0530A9", +"i c #0330B2", +"p c #1336A4", +"a c #1639A4", +"s c #173EB2", +"d c #173EB3", +"f c #103ABD", +"g c #2445AF", +"h c #2848B1", +"j c #2948B2", +"k c #3A57A5", +"l c #3C58A5", +"z c #3054CB", +"x c #536EBF", +"c c #6078AF", +"v c #6178AF", +"b c #737CAF", +"n c #4665C6", +"m c #466BDE", +"M c #4A6CDF", +"N c #4D70DD", +"B c #506AC0", +"V c #566EC0", +"C c #5775CD", +"Z c #5C7BCD", +"A c #5673D2", +"S c #5476DB", +"D c #587BDA", +"F c #577AEA", +"G c #637DCF", +"H c #677ED1", +"J c #607FE3", +"K c #617EE2", +"L c #637FE1", +"P c #7D8D9D", +"I c #7F8F9D", +"U c #6880CF", +"Y c #6C81CE", +"T c #6781D2", +"R c #6681D5", +"E c #6584DA", +"W c #778ACF", +"Q c #7A8EC2", +"! c #7B8FC3", +"~ c #7F97DF", +"^ c #6282E6", +"/ c #6383E6", +"( c #6583E4", +") c #6483E6", +"_ c #6684E6", +"` c #6987E7", +"' c #6A87E6", +"] c #6C87E4", +"[ c #6C87E5", +"{ c #6A86EA", +"} c #6E88E5", +"| c #6D8CEA", +" . c #738DE7", +".. c #748DE6", +"X. c #728BEB", +"o. c #708CE8", +"O. c #7597E1", +"+. c #7795EC", +"@. c #7896E8", +"#. c #7F96E8", +"$. c #7B98EF", +"%. c #814712", +"&. c #804815", +"*. c #804816", +"=. c #8F7748", +"-. c #9E9310", +";. c #898A5C", +":. c #FC941C", +">. c #FF981F", +",. c #FF9A24", +"<. c #FF9A25", +"1. c #FFB407", +"2. c #FFB507", +"3. c #FFBF11", +"4. c #E4BE34", +"5. c #C79F69", +"6. c #C29B72", +"7. c #C7A150", +"8. c #DEBD65", +"9. c #FDAE46", +"0. c #E6D91D", +"q. c #FFD602", +"w. c #FFD40A", +"e. c #FFD40B", +"r. c #FFD709", +"t. c #FFEE1C", +"y. c #FFEF1D", +"u. c #FFF11B", +"i. c #FFFB1D", +"p. c #FFFC1F", +"a. c #FFF024", +"s. c #FFF346", +"d. c #82929D", +"f. c #9BADB4", +"g. c #8393D2", +"h. c #8B9FE2", +"j. c #90A2DE", +"k. c #8BA0EA", +"l. c #9AADEF", +"z. c #AEBBEF", +"x. c #A3B4F1", +"c. c #ACBBF0", +"v. c #ADBBF0", +"b. c #B3BFEE", +"n. c #A2C4F2", +"m. c #A1C5F4", +"M. c #AAC6FF", +"N. c #B3C0F1", +"B. c #B8C4F1", +"V. c #BBC7F3", +"C. c #C4CEF4", +"Z. c #CDD8EB", +"A. c #CCD4F6", +"S. c #CFDBF3", +"D. c #D1DBF4", +"F. c #D3DBF6", +"G. c #D9DFF8", +"H. c #CDE7FF", +"J. c #CFEAFF", +"K. c #E6EAFC", +"L. c #F1FCFF", +"P. c gray100", +"I. c None", +/* pixels */ +"I.I.I.I.I.I.I.I.I.I.I.I.a.7.& I.", +"I.I.u r I.i 1 I.I.I.I.y.u.4.=.* ", +"I.I.s n y E @.: I.I.p.y.e.1.9.2 ", +"I.r T K.H S.P.@.< -.i.e.1.,.%.X ", +"I.s b.G.F.j.S.L.f.0.r.1.,.%. I.", +"r A V.C.A.B.#.S.s.q.1.>.6 I.I.", +"f h.v.v.v.b.x.W 8.3.:.6 I.I.I.", +"7 d.V X.#.h.l.g.b 5.6.Z > I.I.I.", +"5 9 v ! E ] ..Y H C m.J.| > I.", +"O - ;.l H ..] ] ./ D m.H.F = I.", +"I.I.3 w d.x E } ( ( N O.M.j # I.", +"I.I.I.3 8 c g.F ) ( S $.j + I.I.", +"I.I.I.o - ;.k G } F m g + I.I.I.", +"I.I.I.I.I.3 q P x M p @ I.I.I.I.", +"I.I.I.I.I.I.4 0 z a @ I.I.I.I.I.", +"I.I.I.I.I.I.O % ; $ I.I.I.I.I.I." +}; --- kdebase-3.5.6.orig/debian/icons/konqueror.xpm +++ kdebase-3.5.6/debian/icons/konqueror.xpm @@ -0,0 +1,280 @@ +/* XPM */ +static char *konqueror[] = { +/* columns rows colors chars-per-pixel */ +"32 32 242 2", +" c #000000", +". c #040409", +"X c #000414", +"o c #000019", +"O c #00081A", +"+ c #0A0A13", +"@ c #13131B", +"# c #18181F", +"$ c #00062C", +"% c #000431", +"& c #00043F", +"* c #000933", +"= c #001238", +"- c #131321", +"; c #191926", +": c #1B1B2A", +"> c #111F3D", +", c #212126", +"< c #22222C", +"1 c #28282D", +"2 c #252534", +"3 c #2D2D36", +"4 c #2D2C3C", +"5 c #34343F", +"6 c #001B5D", +"7 c #082F74", +"8 c #313146", +"9 c #31314B", +"0 c #3A3A44", +"q c #3B3B4D", +"w c #404051", +"e c #42425D", +"r c #4A4953", +"t c #52525B", +"y c #474762", +"u c #4F4F65", +"i c #515164", +"p c #56566F", +"a c #5C5C6A", +"s c #626270", +"d c #64647A", +"f c #6B6A7E", +"g c #002E82", +"h c #0021BF", +"j c #002BC5", +"k c #002DC8", +"l c #0033C7", +"z c #0033C8", +"x c #003ACA", +"c c #084091", +"v c #0347AB", +"b c #2A4EBA", +"n c #275CA3", +"m c #2E52BC", +"M c #3656BA", +"N c #3758BA", +"B c #0142CC", +"V c #0349CE", +"C c #0846CC", +"Z c #0046D0", +"A c #014CD1", +"S c #004EDC", +"D c #0955C9", +"F c #0152D4", +"G c #045CD8", +"H c #0B56D4", +"J c #0F52DB", +"K c #0958D5", +"L c #1052D1", +"P c #1155D9", +"I c #1D5CD5", +"U c #015FE5", +"Y c #1665D9", +"T c #146ADD", +"R c #1B67D5", +"E c #1964DB", +"W c #1C68DB", +"Q c #245FD1", +"! c #236EDC", +"~ c #2A65D3", +"^ c #2B68D9", +"/ c #2271DC", +"( c #2C76DD", +") c #3678D9", +"_ c #2171E3", +"` c #2C7AE2", +"' c #347CE1", +"] c #3A7FE2", +"[ c #6D6D80", +"{ c #6E6E8A", +"} c #70708C", +"| c #7F7F8E", +" . c #7E7E9B", +".. c #4074DB", +"X. c #5E7AC6", +"o. c #5378DB", +"O. c #3A83E4", +"+. c #398AE3", +"@. c #738FB7", +"#. c #5581DC", +"$. c #598CDB", +"%. c #4185E4", +"&. c #4E81E1", +"*. c #4C8EE5", +"=. c #4693E9", +"-. c #528AE4", +";. c #5193E6", +":. c #5197E9", +">. c #539BEC", +",. c #5C90E2", +"<. c #5897E9", +"1. c #5EA4EF", +"2. c #5DA7F6", +"3. c #738ECF", +"4. c #6494E2", +"5. c #619EEB", +"6. c #7595E4", +"7. c #6FAAEC", +"8. c #61A6F0", +"9. c #66ACF5", +"0. c #6DB5F5", +"q. c #75ADEE", +"w. c #72ABF2", +"e. c #7EB3EF", +"r. c #71B4F5", +"t. c #77BAF6", +"y. c #7BBAF5", +"u. c #818197", +"i. c #82829D", +"p. c #8B8A9A", +"a. c #8C8BA4", +"s. c #9494A6", +"d. c #9393AC", +"f. c #9A99AA", +"g. c #9C9BB2", +"h. c #A1A1B5", +"j. c #A5A5BB", +"k. c #ACABBD", +"l. c #B0AFB7", +"z. c #88A8DD", +"x. c #94B5DE", +"c. c #83A8E5", +"v. c #8CA7EB", +"b. c #8EB1EA", +"n. c #86B9F4", +"m. c #8DBFF4", +"M. c #95B2ED", +"N. c #ADAEC1", +"B. c #A4B3D8", +"V. c #A3BADE", +"C. c #B0AFC1", +"Z. c #B3B2C4", +"A. c #B4B4C9", +"S. c #BAB9C6", +"D. c #BBBAC9", +"F. c #BEBED0", +"G. c #85C0F6", +"H. c #81C6FA", +"J. c #8CC1F6", +"K. c #8BC2F9", +"L. c #8BCAFB", +"P. c #8FD3FF", +"I. c #94C2F4", +"U. c #92C5F9", +"Y. c #90C8FC", +"T. c #9AC6F5", +"R. c #99C3FF", +"E. c #9BC9F7", +"W. c #9ECCFA", +"Q. c #91D2FE", +"!. c #99D8FF", +"~. c #BCC9DE", +"^. c #A4C1E2", +"/. c #A3C8EA", +"(. c #AAC2EC", +"). c #ACC8E7", +"_. c #AAC8E9", +"`. c #A4C9F5", +"'. c #A4CEFB", +"]. c #A8CFF9", +"[. c #ADD1EF", +"{. c #A4D0F9", +"}. c #A2DBFF", +"|. c #ACD3F9", +" X c #B3CAEC", +".X c #BEC9E2", +"XX c #B9CEEB", +"oX c #BFD1EC", +"OX c #B4D5F9", +"+X c #B5D8FA", +"@X c #BAD7FA", +"#X c #BEDBFD", +"$X c #A3E2FF", +"%X c #ACE5FF", +"&X c #AFEBFF", +"*X c #B1E5FF", +"=X c #B1EBFF", +"-X c #B8E1FF", +";X c #BCEDFF", +":X c #BEF2FF", +">X c #C9C7CF", +",X c #C3C3D3", +"XbX> & 6 g g 6 % VXVXVXVXVXVXVXVXVXVXVX", +"VXVXVXVX3 8XBXBXBX0XMX7X4.$.R.iXcXcXiX'.,.7 VXVXVXVXVXVXVXVXVX", +"VXVXVXVX d zXBX0XMXb.-.@XmXBXmXmXcXmXmXBXsX$.$ VXVXVXVXVXVXVXVX", +"VXVXVXVXVX. d.4XMXc.*.iXiXeXeXeXeXrXrXeXrXiXsXw.* VXVXVXVXVXVXVX", +"VXVXVXVXVXVXi NX(.! '.OXOXOX@X#X+X|.].|.|.|.|.#XO.o VXVXVXVXVXVX", +"VXVXVXVXVX l.mXR +.].`.].].|.|.I.I.I.I.I.J.J.I.2.v VXVXVXVXVX", +"VXVXVXVXVX3 BXb.F :.T.I.E.'.'.n.7.q.q.e.q.7.q.q.:.U = VXVXVXVXVX", +"VX. @ 5 q f.BX) G <.m.J.U.U.<.;.;.;.;.;.;.;.;.<.( S c VXVXVXVX", +"| j.S.8XqX0XpXY T =.n.K.J.K.%.( ' ' ] ' ' ' %.] F x D VXVXVXVX", +"2XBXBXBXBXgXoXF x V ` y.L.L.r.( W W E E E E W K F S G X VXVXVXVX", +"1XBXBXBXNXgX XB k k k E t.P.P.L.L.O.B A A A B T / T _ O VXVXVXVX", +"Z.nXBXBXBXfXXXB x l l j ) P.P.!.$X8.x x k j ` 0.` ' >.O VXVXVXVX", +"< w f a.k.2X9XV B l h F L.$X%X=X;XY.L V l H H.>.! 9.;. VXVXVXVX", +"VXVX + p.NX~ B B B 1.&X;X;XtXyX;X^ C I r.$X:.B J n VXVXVXVX", +"VXVXVXVXVX0 BXz.l &.L.&X:XtXyXyXyXaXq.~ J.tXr.r.) P @.4 VXVXVX", +"VXVXVXVXVX S.kXQ -.aX=XyXyXuXaXaXaXuXtXaXyXy.;X|.w.9Xi VXVXVX", +"VXVXVXVXVXVXf vXV.^ wXdXaXuXaXaXaXaXaXaXuXaXdXdX$X6XN.- VXVXVXVX", +"VXVXVXVXVX1 N.D.jXx.=XxXcXcXxXxXxXxXxXxXcXcXxX=X_.D. .f VXVXVX", +"VXVXVXVX s.lXhXD.fX^.*XxXmXBXBXBXBXBXmXmXdX%X).~.p.2Xj.2 VXVXVX", +"VXVXVXVXa 0XBXBX0XD.gX~./.#.o.6.M.v.M.7XwX[..XS.a.2XlX2X} VXVX", +"VXVXVX, X2XD.a.q . 5 a.D.hXjX,Xe VX", +"VXVXVXVX@ Z.8X{ - VXVX 1 d.C.N.N.d.y VXVX. u g.F.a.Z.# ", +"VXVXVXVXVX@ 8 VXVXVXVXVX. h.zXbXbXF.2 VXVXVXVXVX : 9 w zXa. ", +"VXVXVXVXVXVX VXVXVXVXVXVX .qXlXlXd.+ VXVXVXVXVXVXVX 4 + ", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXi 0XbXlX{ VXVXVXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVX4 c gray18", +", c gray21", +"< c #3C3C3C", +"1 c #065906", +"2 c #0D5C0C", +"3 c #105D06", +"4 c #0D600D", +"5 c #14610E", +"6 c #2D6B2D", +"7 c gray28", +"8 c #555555", +"9 c #7A7877", +"0 c #7F7C79", +"q c #7C7C7C", +"w c #0038A8", +"e c #084AB2", +"r c #0F4FB5", +"t c #1357BB", +"y c #1856B8", +"u c #1D5CBC", +"i c #2667C2", +"p c #2766C2", +"a c #2466CD", +"s c #2469C5", +"d c #2867C4", +"f c #2968C3", +"g c #286BC7", +"h c #2C6DC7", +"j c #2D6CC6", +"k c #2F6EC7", +"l c #3170C7", +"z c #3070C8", +"x c #3270CB", +"c c #3272CA", +"v c #3373CB", +"b c #3173CC", +"n c #3479CF", +"m c #3678CE", +"M c #357ADA", +"N c #3D7FD2", +"B c #3E7FD1", +"V c #1B881B", +"C c #31A023", +"Z c #3FA56F", +"A c #4B8247", +"S c #5E854A", +"D c #519443", +"F c #5F967A", +"G c #5F967D", +"H c #4BBF43", +"J c #6C886A", +"K c #7BA86A", +"L c #7FAE75", +"P c #77B377", +"I c #77B47F", +"U c #47C71F", +"Y c #49C617", +"T c #48C538", +"R c #4DC64D", +"E c #5BCA45", +"W c #5CCB41", +"Q c #6ED94A", +"! c #6FCA6F", +"~ c #7CD761", +"^ c #7AD16E", +"/ c #3F81D4", +"( c #548A8C", +") c #669691", +"_ c #6692B0", +"` c #63B39A", +"' c #76A396", +"] c #7DA791", +"[ c #4083D4", +"{ c #4183D5", +"} c #4286D6", +"| c #4485D5", +" . c #4586D7", +".. c #468BD9", +"X. c #4885D4", +"o. c #4988D5", +"O. c #4C8FDB", +"+. c #4C8EDC", +"@. c #5491DB", +"#. c #5196E0", +"$. c #5696E8", +"%. c #5598E0", +"&. c #559AE3", +"*. c #5699E2", +"=. c #599BE3", +"-. c #5C9AE0", +";. c #5F9DE2", +":. c #5DA3E8", +">. c #60A6E9", +",. c #64AAEC", +"<. c #80807F", +"1. c #86AD73", +"2. c #85BE73", +"3. c #92BD64", +"4. c #80C667", +"5. c #88CC6E", +"6. c #84DF63", +"7. c #9BE87D", +"8. c #BBDC77", +"9. c #A0EA70", +"0. c #C1C86C", +"q. c #CFE76B", +"w. c gray52", +"e. c #8A8988", +"r. c #8C8B8D", +"t. c #92908C", +"y. c #919190", +"u. c #9D9D9D", +"i. c #8CAF86", +"p. c #91BC88", +"a. c #AEBB97", +"s. c #B2ACB3", +"d. c #B2ACB6", +"f. c #BCBCBC", +"g. c #899BC7", +"h. c #8AA4D1", +"j. c #8CA5D2", +"k. c #8DA7D1", +"l. c #91A4CE", +"z. c #92ACD7", +"x. c #94AFD7", +"c. c #97B2DB", +"v. c #99B2D5", +"b. c #9DB1D6", +"n. c #A4BBDB", +"m. c #A5BEDF", +"M. c #A2BBE0", +"N. c #87C385", +"B. c #9EC891", +"V. c #90DD82", +"C. c #A6D183", +"Z. c #ABD39B", +"A. c #ADD8A1", +"S. c #ADE48B", +"D. c #A8F08B", +"F. c #B7EF9D", +"G. c #BAF09B", +"H. c #BCF5A0", +"J. c #ACC6E5", +"K. c #B3CDE9", +"L. c #B3CDEA", +"P. c #B9D3EE", +"I. c #BAD3EE", +"U. c #BFD9F2", +"Y. c #C0CF9D", +"T. c #CEDF91", +"R. c #D0DFA5", +"E. c #DDEF9A", +"W. c #C3E2A4", +"Q. c #C8F4AE", +"!. c #C8F8AA", +"~. c #D2EFA2", +"^. c #E2E981", +"/. c #E9EE93", +"(. c gray78", +"). c #CBCAC9", +"_. c #CECDCC", +"`. c #CAC9D9", +"'. c #D0CFCE", +"]. c #D0CCD0", +"[. c #D1CDD1", +"{. c #D2D2D2", +"}. c #D6D5D3", +"|. c #D7D6D5", +" X c #D7D7D7", +".X c #D7D5D8", +"XX c #D8D3D1", +"oX c #D9D5D1", +"OX c #DAD6D2", +"+X c #DAD7D2", +"@X c #DDD9D3", +"#X c gray85", +"$X c #C6D2E6", +"%X c #C0DBF2", +"&X c #C2DDF4", +"*X c #D2DAE9", +"=X c #DDDFEA", +"-X c #DEE2E6", +";X c #D5E1F6", +":X c #E3DFD9", +">X c #E2DFDB", +",X c #E3DFDB", +"X1X_.< dXdX", +".*...n p ;Xt.dXdX", +"8Xx.g { +.*.=.*.+.{ v p $X0 > 8 ", +"0Xh.r v B | .o.b.c.l.g.`.s.d.r.", +"tXk.w y g z z x _ i.G G p.1.S ; ", +"tXz.e u p j k a ( E.W.W.Q.!.7.@ ", +"yXc.t h m B B M ) /.G.G.G.~.8.# ", +"uXm.l | @.-.;.$.' ^.Z.Z.D.T.0.# ", +" XsXpXiX7X6X-X=XY.q.! B.7.S.C.# ", +", <.9 e.).|._.[.a.3.` 7.6.5.K $ ", +"dXdX7 (.5X5XeXeX.X] Z ^ ~ Q Y @ ", +"dXdXu.sXaXeXeX2X3XN.C i.1.2.U @ ", +"dXdX& q f.{. X X].P V J A D W @ ", +"dXdXdX . * : : % 6 R ! H T E @ ", +"dXdXdXdXdXdXdXdXdX- 4 1 2 5 3 X " +}; --- kdebase-3.5.6.orig/debian/icons/ksysguard-16.xpm +++ kdebase-3.5.6/debian/icons/ksysguard-16.xpm @@ -0,0 +1,258 @@ +/* XPM */ +static char *ksysguard-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 236 2", +" c black", +". c #051127", +"X c #0C1C3F", +"o c #0C1E43", +"O c #4C535F", +"+ c #4F5765", +"@ c #616D7F", +"# c #716C64", +"$ c #7E7462", +"% c #24478E", +"& c #224793", +"* c #244890", +"= c #264890", +"- c #264990", +"; c #274990", +": c #274A90", +"> c #284A90", +", c #2A4C91", +"< c #2B4E91", +"1 c #2E4F92", +"2 c #2E4E94", +"3 c #294E9C", +"4 c #305092", +"5 c #365597", +"6 c #365697", +"7 c #365698", +"8 c #3064D1", +"9 c #3164D3", +"0 c #3569D6", +"q c #3775E1", +"w c #697489", +"e c #6C7689", +"r c #747F90", +"t c #647FA8", +"y c #4171D7", +"u c #4E7BD8", +"i c #557FD7", +"p c #6D82A1", +"a c #6E87AD", +"s c #7D8EA7", +"d c #4B81D0", +"f c #5685CD", +"g c #5D84C1", +"h c #5E82D5", +"j c #5B84DA", +"k c #5D90DA", +"l c #4A89E8", +"z c #408AFA", +"x c #4C91F8", +"c c #578DE2", +"v c #5E8EF0", +"b c #5A96EE", +"n c #5A96EF", +"m c #5895F1", +"M c #648CDC", +"N c #688DDD", +"B c #6D90C5", +"V c #6894D5", +"C c #6897DC", +"Z c #6F93DE", +"A c #7192C2", +"S c #7694C5", +"D c #7598CF", +"F c #7F9BC4", +"G c #7597D0", +"H c #7293D9", +"J c #7496DF", +"K c #799ED4", +"L c #6394E9", +"P c #609BF2", +"I c #659FF5", +"U c #609CF8", +"Y c #7B9BE1", +"T c #7D9BE2", +"R c #6DA1EF", +"E c #67A0F5", +"W c #69A1F8", +"Q c #7FA1E7", +"! c #71A6F7", +"~ c #76ABFB", +"^ c #79A0F1", +"/ c #7DAAF3", +"( c #7FB0FF", +") c #86827A", +"_ c #808C9B", +"` c #818C9C", +"' c #978F81", +"] c #899BB7", +"[ c #8B9DB6", +"{ c #8F9FB7", +"} c #959FAB", +"| c #959EAE", +" . c #959FAE", +".. c #979FAC", +"X. c #9C9FA6", +"o. c #97A1B3", +"O. c #9EABBC", +"+. c #A69D90", +"@. c #B0A79D", +"#. c #AFAEAF", +"$. c #B9B0A2", +"%. c #92A9C8", +"&. c #92A7D4", +"*. c #91AAD2", +"=. c #97B3DC", +"-. c #88A5E4", +";. c #87AAF6", +":. c #87B3F7", +">. c #85B3F8", +",. c #87B5FB", +"<. c #86B7FF", +"1. c #8EB0F4", +"2. c #8CB5F6", +"3. c #8BBBFF", +"4. c #94AEE5", +"5. c #96AEE5", +"6. c #9FB3E1", +"7. c #9CB9E4", +"8. c #96BDF5", +"9. c #92B8F8", +"0. c #96BEF9", +"q. c #99BBF1", +"w. c #9BBEF2", +"e. c #A4ADC9", +"r. c #A2B0C4", +"t. c #A2B3CD", +"y. c #A9B1C0", +"u. c #AEB8D0", +"i. c #A3BAE0", +"p. c #A5B9E3", +"a. c #AABCE5", +"s. c #A8BDEA", +"d. c #A8BDEB", +"f. c #A9BEE9", +"g. c #A9BFE9", +"h. c #A8BEEB", +"j. c #A9BEEA", +"k. c #A9BFEA", +"l. c #A9BFEB", +"z. c #ABBEE9", +"x. c #A3BEFA", +"c. c #9BC1F7", +"v. c #9BC1F8", +"b. c #98C2FF", +"n. c #9CC0F9", +"m. c #9DC6FF", +"M. c #BFCCDD", +"N. c #ADC3E2", +"B. c #A6C3F3", +"V. c #A4C5F6", +"C. c #A2C0F8", +"Z. c #A1C5FA", +"A. c #A2C5FC", +"S. c #A5C6F9", +"D. c #A4C7FA", +"F. c #ACC8F3", +"G. c #ADC8F3", +"H. c #ADC9F2", +"J. c #AEC8F2", +"K. c #ADC9F6", +"L. c #A9CDFF", +"P. c #ABCEFF", +"I. c #AECBF8", +"U. c #ADCCFD", +"Y. c #B1CCF5", +"T. c #B2CDF7", +"R. c #B4CEF6", +"E. c #B1CDF8", +"W. c #B1CDFA", +"Q. c #B0CDFC", +"!. c #BACFFC", +"~. c #BDD2F7", +"^. c #BFD5F7", +"/. c #BAD0F8", +"(. c #BBD4FB", +"). c #BED5F8", +"_. c #BED5F9", +"`. c #BFD6F8", +"'. c #C7BCAE", +"]. c #C1BFBA", +"[. c #C6C1B7", +"{. c #CAC2B6", +"}. c #D2C8B9", +"|. c #D7CDBF", +" X c #C3C8D5", +".X c #CCD2DB", +"XX c #CFD1D9", +"oX c #CFD3DD", +"OX c #D8D1C2", +"+X c #DCD5CB", +"@X c #D9D8D6", +"#X c #C3D0E3", +"$X c #C3D6F0", +"%X c #C3D6FF", +"&X c #C4D7FF", +"*X c #C5D8FF", +"=X c #C5D9FF", +"-X c #C5DAFF", +";X c #C7DDFF", +":X c #CEDDF4", +">X c #CEDCF6", +",X c #CADBFA", +"X:X:XdXjXhXiX,X1X1XrXpX& ", +"5.~.`.`.(.6XlXXXvXuX$X`.`./.5X4 ", +"-.J.Y.R.U.wXsXtXvX8X#XT.Y.K./.4 ", +"Z B.D.Z.,.#.vXvXlXeXN.b.c.q.C.< ", +"8 q %.r.k d +.+X{.p P X.X7.;.< ", +"9 y.[.aXqXc l g f z O.lX X0XQ : ", +"0 }.oXuX6XF m n b x '.gX@XiX&.: ", +"y ..lXvX|.C I R R n } lXvXOXM : ", +"u L [ o.K ! V s a ~ R [ .D v % ", +"j / a a <.:.B $.+ 3.,.D p ( ^ : ", +"N 9.s # b.8.S @.O b.8.s $ 2.1.: ", +"J A.o.) P.V.q.].w P.D.{ ' 0.x.> ", +"Y X.i.w T.K.I.=.*.T.K.J.w t.z.% ", +"h e.-X;X-X%X&X&X`.%X&X-X;Xu.T X ", +". 3 6 6 5 5 5 5 5 5 6 5 5 2 o " +}; --- kdebase-3.5.6.orig/debian/icons/kappfinder-16.xpm +++ kdebase-3.5.6/debian/icons/kappfinder-16.xpm @@ -0,0 +1,188 @@ +/* XPM */ +static char *kappfinder-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 166 2", +" c black", +". c #000001", +"X c #000005", +"o c #000006", +"O c #000205", +"+ c #080200", +"@ c #150B02", +"# c #271907", +"$ c #2D1D08", +"% c #2C1D0B", +"& c #34333F", +"* c #4A321B", +"= c #002C99", +"- c #0333BD", +"; c #2B4484", +": c #334B8B", +"> c #334D8C", +", c #0140D6", +"< c #0444D6", +"1 c #0C4ED9", +"2 c #175BDC", +"3 c #054CFF", +"4 c #064CFF", +"5 c #1155FF", +"6 c #2065E0", +"7 c #2365FF", +"8 c #2B73E2", +"9 c #357FE5", +"0 c #3F7CFF", +"q c #4B61A2", +"w c #506BA3", +"e c #5A76BF", +"r c #6B6F88", +"t c #617FB2", +"y c #697DB5", +"u c #6A7EB7", +"i c #6C7EB0", +"p c #3F8AE8", +"a c #5081B9", +"s c #6081B3", +"d c #6386B6", +"f c #6C83BD", +"g c #6B8EBB", +"h c #7085BB", +"j c #7389BE", +"k c #778CBE", +"l c #4786FF", +"z c #4996EA", +"x c #5293FF", +"c c #4AA1E9", +"v c #53A1ED", +"b c #5EA1FF", +"n c #5DAEF1", +"m c #6BAEFF", +"M c #6AB7F6", +"N c #78BAFF", +"B c #8E682A", +"V c #8F682C", +"C c #9D7436", +"Z c #B0731F", +"A c #BC7B1D", +"S c #BE8A3D", +"D c #B4916D", +"F c #C6841F", +"G c #ECC371", +"H c #FDCD6D", +"J c #FDCF70", +"K c #FFD370", +"L c #979AAF", +"P c #98B9D4", +"I c #99BDED", +"U c #AEAEC3", +"Y c #AEB2C3", +"T c #A9BDEE", +"R c #8ACAFF", +"E c #92CDF5", +"W c #9CC4F1", +"Q c #9CD3F6", +"! c #AEC1D4", +"~ c #AFC1D7", +"^ c #BFCED9", +"/ c #A1C4E2", +"( c #A3C9E7", +") c #A6C8E8", +"_ c #A3CFF5", +"` c #A4CBF0", +"' c #ACC8F2", +"] c #A2DDF9", +"[ c #B4DBE9", +"{ c #B8DCE6", +"} c #B1D0F1", +"| c #B1D1F1", +" . c #B2D2F2", +".. c #B2D3F3", +"X. c #B3D4F3", +"o. c #B4D5F4", +"O. c #B9D7F8", +"+. c #B8D8F5", +"@. c #A2E0FC", +"#. c #A6E2FB", +"$. c #A5E2FE", +"%. c #AAE4FB", +"&. c #A9E4FC", +"*. c #A9E4FD", +"=. c #B6E0F0", +"-. c #B1EAFD", +";. c #B2EAFC", +":. c #B3EAFC", +">. c #B4EDFC", +",. c #B8F3FF", +"<. c #BBF2FE", +"1. c #BCF0FD", +"2. c #CEB391", +"3. c #F4D187", +"4. c #FFE79B", +"5. c #FFE69C", +"6. c #C6C2D0", +"7. c #C9C8D4", +"8. c #C9CDD6", +"9. c #CAD4DB", +"0. c #C3D8EE", +"q. c #CFDCEC", +"w. c #C3D1FC", +"e. c #C8D8FF", +"r. c #D4DBE1", +"t. c #DFDFE6", +"y. c #C8EAEF", +"u. c #C0F1FD", +"i. c #C6F7FA", +"p. c #C6F4FD", +"a. c #C7FAFE", +"s. c #CAF4FD", +"d. c #C9F9FE", +"f. c #CBFBFF", +"g. c #CBFDFF", +"h. c #CAFFFF", +"j. c #CEFCFE", +"k. c #D9E1E7", +"l. c #DCE0E4", +"z. c #D7E4FB", +"x. c #DCEBFF", +"c. c #DDEDFF", +"v. c #D4FCFE", +"b. c #D5FFFF", +"n. c #D7FDFD", +"m. c #D9FFFF", +"M. c #DBFFFF", +"N. c #DCFFFF", +"B. c #E0DEE7", +"V. c #ECE8EC", +"C. c #E5EEF1", +"Z. c #E5F2FF", +"A. c #E3FAFB", +"S. c #E3FFFF", +"D. c #E9FEFF", +"F. c #E9FFFF", +"G. c #ECFFFF", +"H. c #EDFFFF", +"J. c #F2F0F4", +"K. c #F6F3F5", +"L. c #FDFAFA", +"P. c #FFFEFA", +"I. c #FEFCFC", +"U. c #FFFFFE", +"Y. c gray100", +"T. c None", +/* pixels */ +"c n v z p 9 8 6 2 1 < , = O T.T.", +"M R N m b x l 0 7 5 3 3 - O T.T.", +"_ Z.c.x.z.' W ) I T w.e.e O T.T.", +"+.Y.Y.P.0.Q $.&.*.=.l.Y.k O T.T.", +"o.Y.Y.q.E <.j.1.:.,.[ V.h O T.T.", +"X.Y.L.) ] b.D.p.d.j.i.r.h O T.T.", +"..Y.J.( *.u.s.b.M.M.n.9.i O T.T.", +"..Y.K./ $.:.d.M.S.G.A.8.y O T.T.", +"..Y.P.! ] ;.a.n.D.Y.k.8.f X T.T.", +"} Y.Y.t.P >.h.N.G.C.L 6.i X T.T.", +"O.Y.Y.Y.B.! { y.^ Y U 2.S $ T.T.", +"e g d s t w : ; : q r G K F $ T.", +"O O O O O O O O O O O B 4.H A # ", +"T.T.T.T.T.T.T.T.T.T.T.+ B 4.H Z ", +"T.T.T.T.T.T.T.T.T.T.T.T.+ C 3.D ", +"T.T.T.T.T.T.T.T.T.T.T.T.T.@ * & " +}; --- kdebase-3.5.6.orig/debian/icons/kinfocenter.xpm +++ kdebase-3.5.6/debian/icons/kinfocenter.xpm @@ -0,0 +1,349 @@ +/* XPM */ +static char * kinfocenter_xpm[] = { +"32 32 314 2", +" c None", +". c #98DBF8", +"+ c #ABE2F9", +"@ c #BBE7FA", +"# c #9CDCF8", +"$ c #85D4F6", +"% c #3DBBF1", +"& c #B8E0F6", +"* c #E8F1F9", +"= c #97D3F2", +"- c #1BA6E6", +"; c #C6DFF3", +"> c #D4E4F4", +", c #ABD6F2", +"' c #1399DB", +") c #9BCAED", +"! c #C0D7F0", +"~ c #D5E4F5", +"{ c #FFFFFF", +"] c #77BFEB", +"^ c #0089CF", +"/ c #229DE3", +"( c #ADCBEB", +"_ c #D6E5F5", +": c #0093E1", +"< c #008DDE", +"[ c #269AE0", +"} c #98BEE6", +"| c #AAC9EA", +"1 c #F8FBFD", +"2 c #007DC6", +"3 c #0088DB", +"4 c #1990DC", +"5 c #84B1E1", +"6 c #A4C6E9", +"7 c #0083D8", +"8 c #559CDB", +"9 c #70A4DC", +"0 c #AFCCEB", +"a c #4698DA", +"b c #8A8ABF", +"c c #8181BB", +"d c #007ED5", +"e c #0C81D5", +"f c #5796D7", +"g c #5C98D7", +"h c #AECBEB", +"i c #4C93D6", +"j c #0680D5", +"k c #005A9E", +"l c #8888BE", +"m c #E4E4E4", +"n c #7F7FBA", +"o c #0079D2", +"p c #057AD2", +"q c #3085D2", +"r c #498CD2", +"s c #A4C5E9", +"t c #2B84D2", +"u c #006183", +"v c #8383BC", +"w c #7D7DB9", +"x c #0074CF", +"y c #0876CE", +"z c #1A7ACE", +"A c #8EBDE7", +"B c #1679CE", +"C c #0475CE", +"D c #107A39", +"E c #178A02", +"F c #178E00", +"G c #158D00", +"H c #138B00", +"I c #118900", +"J c #0F8800", +"K c #0E8600", +"L c #005D00", +"M c #7B7BB7", +"N c #006EBF", +"O c #006FCB", +"P c #80B7E5", +"Q c #46A948", +"R c #78D05E", +"S c #7AD660", +"T c #78D460", +"U c #76D260", +"V c #73D060", +"W c #31B718", +"X c #7979B6", +"Y c #0E797D", +"Z c #006AC8", +"` c #80B4E4", +" . c #0875A4", +".. c #6AB859", +"+. c #9EDD8D", +"@. c #77D360", +"#. c #75D160", +"$. c #73CF60", +"%. c #B1E4A7", +"&. c #43BC30", +"*. c #7777B5", +"=. c #318030", +"-. c #0065C5", +";. c #80B2E2", +">. c #1A9042", +",. c #6EBD5C", +"'. c #23B600", +"). c #1FB300", +"!. c #1CB000", +"~. c #9ADB8F", +"{. c #40B930", +"]. c #7575B4", +"^. c #6CAEC0", +"/. c #005FC2", +"(. c #5091D5", +"_. c #297AAC", +":. c #8DAD8B", +"<. c #A2B69F", +"[. c #9DB497", +"}. c #7BA073", +"|. c #31AA1B", +"1. c #18AD00", +"2. c #98DA8F", +"3. c #3DB630", +"4. c #7373B3", +"5. c #B9F78F", +"6. c #369099", +"7. c #005DC0", +"8. c #307BCC", +"9. c #2072BC", +"0. c #94BB9D", +"a. c #95959B", +"b. c #848484", +"c. c #6A6A6A", +"d. c #505050", +"e. c #219110", +"f. c #14A900", +"g. c #97D88F", +"h. c #3AB430", +"i. c #7070B2", +"j. c #B7F58F", +"k. c #B4F28E", +"l. c #4695A4", +"m. c #0C7386", +"n. c #3BA431", +"o. c #61AE54", +"p. c #979798", +"q. c #727272", +"r. c #585858", +"s. c #3E3E3E", +"t. c #1A8A0B", +"u. c #11A600", +"v. c #95D78F", +"w. c #37B130", +"x. c #6E6EB0", +"y. c #B6F48F", +"z. c #B5F38F", +"A. c #B1EF8E", +"B. c #74BC7F", +"C. c #17807B", +"D. c #0D7386", +"E. c #1C9135", +"F. c #24A007", +"G. c #22A306", +"H. c #2DB30E", +"I. c #3BAA24", +"J. c #2E9D1A", +"K. c #259413", +"L. c #1B8B0D", +"M. c #129E02", +"N. c #0DA300", +"O. c #94D58F", +"P. c #34AE30", +"Q. c #6C6CAF", +"R. c #B4F28F", +"S. c #B3F28F", +"T. c #B2F08F", +"U. c #9FEB77", +"V. c #64CE33", +"W. c #3AB607", +"X. c #84B2B0", +"Y. c #269A35", +"Z. c #6BAB91", +"`. c #83B1B0", +" + c #A3C5AB", +".+ c #ACCBAA", +"++ c #AECDAB", +"@+ c #BADCB5", +"#+ c #C6EABE", +"$+ c #CBEBC4", +"%+ c #D2E4CE", +"&+ c #CBDEC8", +"*+ c #C5D8C2", +"=+ c #BFD1BC", +"-+ c #C0E1BE", +";+ c #93D58F", +">+ c #92D48F", +",+ c #31AC30", +"'+ c #6A6AAE", +")+ c #DCB46B", +"!+ c #DBB46B", +"~+ c #B0EF8F", +"{+ c #D1F5BF", +"]+ c #D0F4BF", +"^+ c #69D539", +"/+ c #BFBFC1", +"(+ c #99999C", +"_+ c #7F7F83", +":+ c #2DB404", +"<+ c #2AB104", +"[+ c #28B502", +"}+ c #26B900", +"|+ c #4DBC38", +"1+ c #B0B0B0", +"2+ c #8A8A8A", +"3+ c #707070", +"4+ c #565656", +"5+ c #479B41", +"6+ c #92D38F", +"7+ c #91D38F", +"8+ c #30AB30", +"9+ c #6868AD", +"0+ c #E9A060", +"a+ c #E89F60", +"b+ c #69DE30", +"c+ c #43D300", +"d+ c #CFF3BF", +"e+ c #63D036", +"f+ c #A3A3A3", +"g+ c #747474", +"h+ c #4F4F4F", +"i+ c #A3E38F", +"j+ c #A2E28F", +"k+ c #A0E18F", +"l+ c #9FDF8F", +"m+ c #9DDE8F", +"n+ c #9CDC8F", +"o+ c #A9DAA1", +"p+ c #A0A0A0", +"q+ c #797979", +"r+ c #5F5F5F", +"s+ c #444444", +"t+ c #86B084", +"u+ c #90D28F", +"v+ c #8FD28F", +"w+ c #6666AC", +"x+ c #66DB30", +"y+ c #3FD000", +"z+ c #CEF2BF", +"A+ c #5DCA33", +"B+ c #8E8E8E", +"C+ c #5B5B5B", +"D+ c #353535", +"E+ c #52C930", +"F+ c #4EC630", +"G+ c #4287CB", +"H+ c #3F72FF", +"I+ c #4185CB", +"J+ c #58BC4B", +"K+ c #72976E", +"L+ c #52774F", +"M+ c #3D633B", +"N+ c #294E27", +"O+ c #2C912B", +"P+ c #24A624", +"Q+ c #6464AB", +"R+ c #AEED8F", +"S+ c #ADEC8F", +"T+ c #60D630", +"U+ c #CDF1BF", +"V+ c #35C600", +"W+ c #CBF0BF", +"X+ c #CAEFBF", +"Y+ c #22B600", +"Z+ c #3782BF", +"`+ c #3580BF", +" @ c #0AA000", +".@ c #069C00", +"+@ c #029900", +"@@ c #009700", +"#@ c #6262A9", +"$@ c #C7F2B3", +"%@ c #90E46B", +"&@ c #5DD330", +"*@ c #CCF1BF", +"=@ c #31C300", +"-@ c #CAEEBF", +";@ c #89BACB", +">@ c #82AEDF", +",@ c #87B8CB", +"'@ c #B3E0B3", +")@ c #5F5FA8", +"!@ c #F3F497", +"~@ c #EAE071", +"{@ c #F3DA70", +"]@ c #D6F47F", +"^@ c #F2DA70", +"/@ c #CBEF74", +"(@ c #F2D970", +"_@ c #D2E873", +":@ c #C7EC74", +"<@ c #F1D870", +"[@ c #307F30", +"}@ c #0C700C", +"|@ c #006C00", +"1@ c #5D5DA7", +"2@ c #FFF489", +"3@ c #FFDD67", +"4@ c #FFD256", +"5@ c #FFFF9A", +"6@ c #5B5BA6", +"7@ c #5959A5", +"8@ c #5A5AA5", +"9@ c #5757A4", +" ", +" . + @ @ # $ % ", +" & * * * * * * * * = - ", +" ; > > > > > > > > > > , ' ", +" ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^ ", +" / ( ( ( ( ( _ { { _ ( ( ( ( ( : ", +" < [ } } } } } | 1 1 | } } } } } [ 2 ", +" 3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3 ", +" 7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7 ", +"b b b c d d e f g g g h { { h g g g i j d d k ", +"l m m n o o o p q r r s { { s r r t p o o o u ", +"b v m w x x x x x y z A { { A B C x x x x x D E F G H I J K L ", +" b m M N O O O O O O P { { P O O O O O O O Q R S T U U V W L ", +" b m X Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z ...+.@.#.$.$.%.&.L ", +" b m *. =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ", +" b m ]. =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ", +" b m 4. =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ", +" b m i. =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ", +" b m x. =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ", +" b m Q. =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ", +" b m '+ =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ", +" b m 9+ =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ", +" b m w+ =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ", +" b m Q+ =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ", +" b m #@ =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ", +" b m )@ =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ", +" b m 1@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", +" b m 6@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", +" b m 7@ =.=.=.=.=.=.=.=.=.=.=.=.=. ", +" b 8@9@ ", +" ", +" "}; --- kdebase-3.5.6.orig/debian/icons/konsole.xpm +++ kdebase-3.5.6/debian/icons/konsole.xpm @@ -0,0 +1,92 @@ +/* XPM */ +static char *konsole[] = { +/* columns rows colors chars-per-pixel */ +"32 32 54 1", +" c #000000", +". c #0B0B0B", +"X c #141414", +"o c #1C1C1C", +"O c #232323", +"+ c #2B2B2B", +"@ c #343434", +"# c #3A3B3B", +"$ c #434343", +"% c #494949", +"& c #4E5151", +"* c #535353", +"= c #565A5A", +"- c #595A5A", +"; c #5E6262", +": c #636363", +"> c #6A6A6A", +", c #6F7272", +"< c #727272", +"1 c #757E7E", +"2 c #7C7C7C", +"3 c #7F8686", +"4 c #838383", +"5 c #898989", +"6 c #899595", +"7 c #939494", +"8 c #989898", +"9 c #9BA6A6", +"0 c #A3A3A3", +"q c #A3AFAF", +"w c #ACACAC", +"e c #A6B0B0", +"r c #A9B6B6", +"t c #B2B2B2", +"y c #B3BABA", +"u c #BCBCBC", +"i c #B7C2C2", +"p c #BBC6C6", +"a c #BECACA", +"s c #C4C4C4", +"d c #C0CECE", +"f c #CBCBCB", +"g c #C5D4D4", +"h c #C9D8D8", +"j c #D4D4D4", +"k c #DADADA", +"l c #E3E3E3", +"z c #EBEBEB", +"x c #E9F5F5", +"c c #ECFAFA", +"v c #F3F3F3", +"b c #F2FFFF", +"n c #FDFEFE", +"m c None", +/* pixels */ +"m$<42222242222242222222222222# m", +"Ounnnnnnnnnnnnnnnnnnnnnnnnnnnj%m", +"5nnnnnnnnnnnnnnnnnnnnnnnnnnnnny.", +"0nnu8tsssssssssssssssssssu8tnnfX", +"0nn:1y74455455555555555555$@vnsX", +"0nn7pcbu>>>>>>>>>>>>>>>>>llsX", +"wnn><<>,>::--*&%$@:jssO", +"snnvvzvzzzzzzlzllllkkkkjkjjjfssO", +"wnnnvvvvvzzllllkkkkkkjjjfffssfuX", +"Ojnnnnnnnzlllllkkkkjjjkjkjjjjj: ", +"mo:<<<>>:0jssssusuuuu8>>>,,<,# m", +"mm o>0kkkjjjjjjju04@ mm", +"mmmmm 4znvjlvvvvvvvlknnnwOmmmmmm", +"mmmm 4nnnnvllznvvvkfjznnnu.mmmmm", +"mmmmXunvnvzzlkjjjfsjklvnnlommmmm", +"mmmm -lvvzzzzzzlllzzzzvvv5 mmmmm", +"mmmmm $tkzzzzllzlzlzzzls<. mmmmm", +"mmmmmm .%4wusjkkkjjuw7-o mmmmmm", +"mmmmmmmm .o#%%%%%#+X mmmmmmmm" +}; --- kdebase-3.5.6.orig/debian/icons/kate-16.xpm +++ kdebase-3.5.6/debian/icons/kate-16.xpm @@ -0,0 +1,185 @@ +/* XPM */ +static char *kate-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 163 2", +" c black", +". c #000002", +"X c #050300", +"o c #070500", +"O c #080500", +"+ c #00031A", +"@ c #00071B", +"# c #00061C", +"$ c #00081F", +"% c #191603", +"& c #1D160E", +"* c #1F190E", +"= c #000C3B", +"- c #372F05", +"; c #06184E", +": c #01165C", +"> c #01185E", +", c #061A5C", +"< c #000F60", +"1 c #001B6C", +"2 c #503C20", +"3 c #52470F", +"4 c #60540D", +"5 c #67590B", +"6 c #7A4A2E", +"7 c #485872", +"8 c #586265", +"9 c #596265", +"0 c #5C6564", +"q c #616961", +"w c #626961", +"e c #0028A6", +"r c #002BA7", +"t c #012CA8", +"y c #022CA9", +"u c #0530A9", +"i c #0330B2", +"p c #1336A4", +"a c #1639A4", +"s c #173EB2", +"d c #173EB3", +"f c #103ABD", +"g c #2445AF", +"h c #2848B1", +"j c #2948B2", +"k c #3A57A5", +"l c #3C58A5", +"z c #3054CB", +"x c #536EBF", +"c c #6078AF", +"v c #6178AF", +"b c #737CAF", +"n c #4665C6", +"m c #466BDE", +"M c #4A6CDF", +"N c #4D70DD", +"B c #506AC0", +"V c #566EC0", +"C c #5775CD", +"Z c #5C7BCD", +"A c #5673D2", +"S c #5476DB", +"D c #587BDA", +"F c #577AEA", +"G c #637DCF", +"H c #677ED1", +"J c #607FE3", +"K c #617EE2", +"L c #637FE1", +"P c #7D8D9D", +"I c #7F8F9D", +"U c #6880CF", +"Y c #6C81CE", +"T c #6781D2", +"R c #6681D5", +"E c #6584DA", +"W c #778ACF", +"Q c #7A8EC2", +"! c #7B8FC3", +"~ c #7F97DF", +"^ c #6282E6", +"/ c #6383E6", +"( c #6583E4", +") c #6483E6", +"_ c #6684E6", +"` c #6987E7", +"' c #6A87E6", +"] c #6C87E4", +"[ c #6C87E5", +"{ c #6A86EA", +"} c #6E88E5", +"| c #6D8CEA", +" . c #738DE7", +".. c #748DE6", +"X. c #728BEB", +"o. c #708CE8", +"O. c #7597E1", +"+. c #7795EC", +"@. c #7896E8", +"#. c #7F96E8", +"$. c #7B98EF", +"%. c #814712", +"&. c #804815", +"*. c #804816", +"=. c #8F7748", +"-. c #9E9310", +";. c #898A5C", +":. c #FC941C", +">. c #FF981F", +",. c #FF9A24", +"<. c #FF9A25", +"1. c #FFB407", +"2. c #FFB507", +"3. c #FFBF11", +"4. c #E4BE34", +"5. c #C79F69", +"6. c #C29B72", +"7. c #C7A150", +"8. c #DEBD65", +"9. c #FDAE46", +"0. c #E6D91D", +"q. c #FFD602", +"w. c #FFD40A", +"e. c #FFD40B", +"r. c #FFD709", +"t. c #FFEE1C", +"y. c #FFEF1D", +"u. c #FFF11B", +"i. c #FFFB1D", +"p. c #FFFC1F", +"a. c #FFF024", +"s. c #FFF346", +"d. c #82929D", +"f. c #9BADB4", +"g. c #8393D2", +"h. c #8B9FE2", +"j. c #90A2DE", +"k. c #8BA0EA", +"l. c #9AADEF", +"z. c #AEBBEF", +"x. c #A3B4F1", +"c. c #ACBBF0", +"v. c #ADBBF0", +"b. c #B3BFEE", +"n. c #A2C4F2", +"m. c #A1C5F4", +"M. c #AAC6FF", +"N. c #B3C0F1", +"B. c #B8C4F1", +"V. c #BBC7F3", +"C. c #C4CEF4", +"Z. c #CDD8EB", +"A. c #CCD4F6", +"S. c #CFDBF3", +"D. c #D1DBF4", +"F. c #D3DBF6", +"G. c #D9DFF8", +"H. c #CDE7FF", +"J. c #CFEAFF", +"K. c #E6EAFC", +"L. c #F1FCFF", +"P. c gray100", +"I. c None", +/* pixels */ +"I.I.I.I.I.I.I.I.I.I.I.I.a.7.& I.", +"I.I.u r I.i 1 I.I.I.I.y.u.4.=.* ", +"I.I.s n y E @.: I.I.p.y.e.1.9.2 ", +"I.r T K.H S.P.@.< -.i.e.1.,.%.X ", +"I.s b.G.F.j.S.L.f.0.r.1.,.%. I.", +"r A V.C.A.B.#.S.s.q.1.>.6 I.I.", +"f h.v.v.v.b.x.W 8.3.:.6 I.I.I.", +"7 d.V X.#.h.l.g.b 5.6.Z > I.I.I.", +"5 9 v ! E ] ..Y H C m.J.| > I.", +"O - ;.l H ..] ] ./ D m.H.F = I.", +"I.I.3 w d.x E } ( ( N O.M.j # I.", +"I.I.I.3 8 c g.F ) ( S $.j + I.I.", +"I.I.I.o - ;.k G } F m g + I.I.I.", +"I.I.I.I.I.3 q P x M p @ I.I.I.I.", +"I.I.I.I.I.I.4 0 z a @ I.I.I.I.I.", +"I.I.I.I.I.I.O % ; $ I.I.I.I.I.I." +}; --- kdebase-3.5.6.orig/debian/icons/konsole-16.xpm +++ kdebase-3.5.6/debian/icons/konsole-16.xpm @@ -0,0 +1,170 @@ +/* XPM */ +static char *konsole-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 148 2", +" c black", +". c #010101", +"X c #050606", +"o c #090909", +"O c #0B0B0B", +"+ c #0C0C0C", +"@ c #0E0D0D", +"# c gray6", +"$ c #111111", +"% c gray7", +"& c #131313", +"* c #161616", +"= c #181818", +"- c #191919", +"; c gray10", +": c #1B1B1B", +"> c #1D1D1D", +", c gray12", +"< c #202020", +"1 c #222222", +"2 c #232323", +"3 c #242323", +"4 c gray14", +"5 c #252525", +"6 c gray15", +"7 c #272727", +"8 c #282828", +"9 c #2A2A2A", +"0 c #2C2C2C", +"q c gray18", +"w c #2F2F2F", +"e c gray19", +"r c #313131", +"t c #323333", +"y c gray20", +"u c #333535", +"i c #343434", +"p c #383737", +"a c gray22", +"s c #393838", +"d c #393939", +"f c #3A3A3A", +"g c gray23", +"h c #3B3D3D", +"j c #3C3C3C", +"k c #3D3C3C", +"l c #3F3F3F", +"z c gray25", +"x c #414141", +"c c #464646", +"v c gray29", +"b c #4C4C4C", +"n c #515151", +"m c gray33", +"M c #555555", +"N c #555757", +"B c gray34", +"V c #5B5B5B", +"C c gray36", +"Z c #605F5F", +"A c #606060", +"S c gray38", +"D c #626262", +"F c #606565", +"G c #646464", +"H c gray40", +"J c #676767", +"K c #6A6A6A", +"L c gray42", +"P c #6F6F6F", +"I c gray44", +"U c gray45", +"Y c #717777", +"T c #747474", +"R c #7C7C7C", +"E c #7E7E7E", +"W c #818181", +"Q c #838383", +"! c #848484", +"~ c #868686", +"^ c gray53", +"/ c #828888", +"( c #848C8C", +") c gray56", +"_ c #8F9090", +"` c #8F9797", +"' c #909090", +"] c gray58", +"[ c gray60", +"{ c gray62", +"} c #97A1A1", +"| c gray64", +" . c gray67", +".. c gray68", +"X. c #AFAFAF", +"o. c #A7B1B1", +"O. c #B6B6B6", +"+. c #B7B7B7", +"@. c #B5BDBD", +"#. c gray73", +"$. c #BBBBBB", +"%. c gray74", +"&. c gray76", +"*. c gray77", +"=. c #C5C5C5", +"-. c #C6C6C6", +";. c #C8C8C8", +":. c #CBCBCB", +">. c #CDCDCD", +",. c #CECECE", +"<. c #CBD8D8", +"1. c #D0D0D0", +"2. c gray82", +"3. c #D2D2D2", +"4. c gray83", +"5. c gray84", +"6. c #D7D7D7", +"7. c #D8D8D8", +"8. c gray85", +"9. c #DADADA", +"0. c gray86", +"q. c #DDDDDD", +"w. c gray87", +"e. c #DFDFDF", +"r. c #E1E1E1", +"t. c #E2E2E2", +"y. c #E3E2E2", +"u. c gray89", +"i. c #E4E3E3", +"p. c #E4E4E4", +"a. c gray90", +"s. c #E6E6E6", +"d. c #E7E7E7", +"f. c gray91", +"g. c #E9E9E9", +"h. c #EAEAEA", +"j. c gray92", +"k. c #ECECEC", +"l. c gray93", +"z. c #EEEEEE", +"x. c #E0F0F0", +"c. c gray94", +"v. c #F1F1F1", +"b. c #F3F3F3", +"n. c #F4F4F4", +"m. c gray97", +"M. c gray100", +"N. c None", +/* pixels */ +"M -.;.-.-.-.-.-.-.-.-.-.-.;.| * ", +"1.n.9.y.p.g.g.g.g.g.g.g.y.5.M.L ", +"i.#.o.@._ Q ! ! ! ! ! ! Q J m.T ", +"p.%./ x.<.D Z D D D D D D I j.I ", +"p.%.} ` M a a l x x l x a z y.P ", +"j.+.X @ 3 Y ( F 7 8 1 < O 1 y.I ", +"j.+.. O ; u h e 1 > * @ . 5 e.P ", +"c.%.% > 7 9 q e e 0 7 > O 9 0.I ", +"c.%.; 7 y g z z x a r 7 % q 9.P ", +"c.-.a c M C D F D C n c u v 9.I ", +"e.M.m.b.j.d.u.y.q.7.5.7.5.1.q.J ", +"b ....{ +.0.7.1.,.,.#.] _ [ ^ > ", +". . . J &.q.y.p.y.9.1.X.l . . N.", +"N.N.V M.M.j.p.g.p.5.g.M.9.% N.N.", +"N.N.> ..g.n.j.g.g.j.c.y.R . N.N.", +"N.N.N.. a J ^ ' _ E M 1 . N.N.N." +}; --- kdebase-3.5.6.orig/debian/icons/ktip.xpm +++ kdebase-3.5.6/debian/icons/ktip.xpm @@ -0,0 +1,250 @@ +/* XPM */ +static char *ktip[] = { +/* columns rows colors chars-per-pixel */ +"32 32 212 2", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #0A0A0B", +"+ c gray5", +"@ c #121215", +"# c #191919", +"$ c #111120", +"% c #111121", +"& c #161629", +"* c #17172A", +"= c #191930", +"- c #202020", +"; c gray13", +": c #282828", +"> c #28283B", +", c #343434", +"< c #252546", +"1 c #2B2B51", +"2 c #2E2E58", +"3 c #3E3E52", +"4 c #353565", +"5 c #363668", +"6 c #393961", +"7 c #38386B", +"8 c #3A3A6F", +"9 c gray26", +"0 c gray30", +"q c #4E4E4E", +"w c #585858", +"e c #5D5D5D", +"r c #5F5F5F", +"t c #42427E", +"y c #484878", +"u c #555568", +"i c gray39", +"p c #676767", +"a c #636373", +"s c #6C6C7F", +"d c #747474", +"f c #48488A", +"g c #4C4C91", +"h c #4D4D92", +"j c #4D4D93", +"k c #58588A", +"l c #515197", +"z c #545497", +"x c #505098", +"c c #505099", +"v c #51519A", +"b c #51519B", +"n c #52529D", +"m c #53539E", +"M c #53539F", +"N c #5555A2", +"B c #5959A4", +"V c #5C5CA5", +"C c #5C5DA8", +"Z c #5E5EA8", +"A c #747487", +"S c #77778E", +"D c #6161A1", +"F c #6464A1", +"G c #6262A9", +"H c #6667AE", +"J c #6868AD", +"K c #6869AE", +"L c #6A6AAF", +"P c #6D6DAF", +"I c #6F6FAD", +"U c #6B6DB3", +"Y c #7575AA", +"T c #7474B0", +"R c #7678B9", +"E c #7878B5", +"W c #7C7CB8", +"Q c #7D7DB9", +"! c #7D80BF", +"~ c #7F80BC", +"^ c #848484", +"/ c gray56", +"( c #8383BB", +") c #8484BA", +"_ c #8888BE", +"` c #9595A1", +"' c #9C9CB1", +"] c #AAAABC", +"[ c #8488C8", +"{ c #8B8BC0", +"} c #8D8DC1", +"| c #8C8EC5", +" . c #8E90C6", +".. c #9090C3", +"X. c #9191C3", +"o. c #9494C5", +"O. c #9595C5", +"+. c #9595C6", +"@. c #9799CC", +"#. c #9898C7", +"$. c #9999C7", +"%. c #9A9AC8", +"&. c #9C9CC9", +"*. c #9E9ECA", +"=. c #9F9FCA", +"-. c #9F9FCB", +";. c #9B9ED1", +":. c #989DD6", +">. c #9C9ED0", +",. c #9BA1D9", +"<. c #A0A0CA", +"1. c #A1A1CE", +"2. c #A1A2CE", +"3. c #A2A2CC", +"4. c #A5A5CE", +"5. c #A2A3D1", +"6. c #A3A5D3", +"7. c #A5A8D6", +"8. c #A5AADC", +"9. c #A8A8D1", +"0. c #A9ADDD", +"q. c #B3B3C3", +"w. c #B9B9C7", +"e. c #BBBCDC", +"r. c #A3AAE2", +"t. c #A7AFE8", +"y. c #A8AEE1", +"u. c #ABB3E8", +"i. c #AEB7EE", +"p. c #B3B7E3", +"a. c #B1B7E8", +"s. c #B5BAE6", +"d. c #B1B8EB", +"f. c #B3B9E8", +"g. c #B1BAEE", +"h. c #B3BBEE", +"j. c #B6BDEE", +"k. c #BABFE8", +"l. c #B9C0EE", +"z. c #B6C0F4", +"x. c #BCC5F5", +"c. c #BDC6F8", +"v. c #C2C2C4", +"b. c #CDCDCF", +"n. c #C3C3D0", +"m. c #C7C7D3", +"M. c #CFCFD9", +"N. c #D5D5DE", +"B. c #DBDBDC", +"V. c #C3C7ED", +"C. c #C0C7F0", +"Z. c #C1C7F0", +"A. c #C9D3FF", +"S. c #D7D7E0", +"D. c #D7D8EE", +"F. c #DADAE2", +"G. c #DCDCE3", +"H. c #DDDDE4", +"J. c #D3D7F3", +"K. c #D1DAFF", +"L. c #D3DAFF", +"P. c #D5DDFF", +"I. c #D6DDFF", +"U. c #D6DEFF", +"Y. c #D7DEFF", +"T. c #D7DFFF", +"R. c #D9DCF3", +"E. c #D8DFFF", +"W. c #D9E0FF", +"Q. c #DAE1FF", +"!. c #DDE1FA", +"~. c #DCE2FF", +"^. c #DCE3FF", +"/. c #DDE3FF", +"(. c #DEE4FF", +"). c #DFE5FF", +"_. c #E3E3E9", +"`. c #E4E4EA", +"'. c #E8E8ED", +"]. c #E9E9ED", +"[. c #E2E5F9", +"{. c #E0E6FF", +"}. c #E1E6FF", +"|. c #E1E7FF", +" X c #E2E7FF", +".X c #E2E8FF", +"XX c #E3E8FF", +"oX c #E4E9FF", +"OX c #E5EAFF", +"+X c #E6EBFF", +"@X c #EFEFF0", +"#X c #EEEEF2", +"$X c #E8ECFF", +"%X c #E9ECFF", +"&X c #EBEFFF", +"*X c #ECEFFF", +"=X c #EFF2FF", +"-X c #EFF3FF", +";X c #F4F4F7", +":X c #F0F3FF", +">X c #F2F4FF", +",X c #F4F6FF", +"X>X+XT.j.[ B n 1 9X9X9X9X9X9X", +"9X9X9X9X9X9X4.3.3.j./.8X8X8X8X8X8X8X8X8XX>X-X-X-X-X-X-X-X-X-XL.d.N 9X9X9X", +"9X9X9X9X9X_ p.T.|.-X&X&X-X+X*X*X&X&X&X&X&X&X&X XT.8.N 9X9X9X", +"9X9X9X9X9X( @.Q.Q.XX+X+X+X+XXX+X+X+X+X+X+X+X XQ.E.R l 9X9X9X", +"9X9X9X9X9XY Q V.Q.Q.|.|.|.|.XXXX X X X). X/././.k.N 8 9X9X9X", +"9X9X9X9X9X T Q |.|.(.|.(.Q.Q.Q./.^.^.).|././. XH b 9X9X9X", +"9X9X9X9X9X k P 7.XXXXXXXXXX|.|.).). X X X X X-.N 2 9X9X9X", +"9X9X9X9X9X9X D K E.XX+XXX+XXX+X+XOXOX+X+XXXJ.V f 9X9X9X9X", +"9X9X9X9X9X9X 6 V .%X%X%X%X%X%X+X+X+X*X+X%X| M $ 9X9X9X9X", +"9X9X9X9X9X9X9X l N R.*X*X*X*X*X-X&X*X-X*X[.N t 9X9X9X9X9X", +"9X9X9X9X9X9X9X9X5 N 5.-X-X-X-X-X-X-X-X-X-X5.N % 9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X c J >X>X>X>X,X>X>X-X-X,XK f 9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9Xh N D.2X,X1X1X1X1X1X1XD.N 4 9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X N e.2X2X2X2X5X1X2X1Xe.N 9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X N 9.2X2X8X4X5X5X5X5X9.N 9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9XM O.8X8X8X8X8X8X8X8XO.j 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9Xb N N N N N N N N N N t 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9X S s u 3 > * * * * = 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9X^ / ].;X;X]._.F.S.` @ 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9Xp d v.].F.M.n.q.' a O 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9Xi r B.;X;X]._.S.' a O 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9X0 w b._.N.n.w.] ' A @ 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9X : + , r 9 ; o 9X9X9X9X9X9X9X9X", +"9X9X9X9X9X9X9X9X9X9X # r q ; o 9X9X9X9X9X9X9X9X" +}; --- kdebase-3.5.6.orig/debian/icons/keditbookmarks.xpm +++ kdebase-3.5.6/debian/icons/keditbookmarks.xpm @@ -0,0 +1,286 @@ +/* XPM */ +static char *keditbookmarks[] = { +/* columns rows colors chars-per-pixel */ +"32 32 248 2", +" c black", +". c #351600", +"X c #381600", +"o c #381B00", +"O c #522A00", +"+ c #5E2200", +"@ c #5B2900", +"# c #6B2500", +"$ c #722D00", +"% c #722E00", +"& c #7C3400", +"* c #7B4000", +"= c #8E3600", +"- c #8C3F00", +"; c #973C00", +": c #9C3500", +"> c #9C3E00", +", c #A33600", +"< c #A23D00", +"1 c #A93B00", +"2 c #AA3F00", +"3 c #9B5200", +"4 c #A64100", +"5 c #A94D00", +"6 c #A65A00", +"7 c #B54F00", +"8 c #BD4500", +"9 c #B84800", +"0 c #B84900", +"q c #BE4E00", +"w c #B25700", +"e c #B65100", +"r c #BD5A00", +"t c #C24100", +"y c #C64400", +"u c #C74700", +"i c #C14B00", +"p c #C24E00", +"a c #C44800", +"s c #C84800", +"d c #CB4A00", +"f c #CC4E00", +"g c #CE4F00", +"h c #CA5300", +"j c #CC5200", +"k c #CC5B00", +"l c #D05200", +"z c #D05300", +"x c #D15500", +"c c #D25400", +"v c #D25500", +"b c #D45700", +"n c #D35A00", +"m c #D55900", +"M c #D65A00", +"N c #D65B00", +"B c #D85B00", +"V c #D85C00", +"C c #D95E00", +"Z c #DA5F00", +"A c #DE5F00", +"S c #C66300", +"D c #C36C00", +"F c #D56100", +"G c #D76F00", +"H c #DA6000", +"J c #DB6200", +"K c #DE6200", +"L c #DC6700", +"P c #DF6400", +"I c #DF6500", +"U c #DF6900", +"Y c #DE6D00", +"T c #D37100", +"R c #D67C00", +"E c #D87A00", +"W c #DF7800", +"Q c #E05F00", +"! c #E06700", +"~ c #E46700", +"^ c #E16800", +"/ c #E16C00", +"( c #E46A00", +") c #E46E00", +"_ c #E56E00", +"` c #E56F00", +"' c #E66F00", +"] c #EE6E00", +"[ c #E17100", +"{ c #E37000", +"} c #E47300", +"| c #E67100", +" . c #E77100", +".. c #E77200", +"X. c #E27D09", +"o. c #E97000", +"O. c #E97500", +"+. c #EB7600", +"@. c #E87900", +"#. c #EA7900", +"$. c #E97C00", +"%. c #EC7800", +"&. c #EC7A00", +"*. c #ED7A00", +"=. c #EE7A00", +"-. c #ED7C00", +";. c #F27500", +":. c #F27B00", +">. c #F17D00", +",. c #F97300", +"<. c #F87D00", +"1. c #FC7B00", +"2. c #E58405", +"3. c #E68404", +"4. c #EC8100", +"5. c #ED8100", +"6. c #E88A00", +"7. c #E78915", +"8. c #E5881E", +"9. c #EE9F14", +"0. c #F18300", +"q. c #F28100", +"w. c #F18500", +"e. c #F28500", +"r. c #F48500", +"t. c #F68400", +"y. c #F78500", +"u. c #F78700", +"i. c #F28E00", +"p. c #F38E00", +"a. c #F98300", +"s. c #FF8300", +"d. c #F88800", +"f. c #F88900", +"g. c #F88A00", +"h. c #F98A00", +"j. c #F98C00", +"k. c #F88E00", +"l. c #FB8D00", +"z. c #FD8F00", +"x. c #FF8E00", +"c. c #FF8F00", +"v. c #F89003", +"b. c #F99600", +"n. c #FD9000", +"m. c #FE9200", +"M. c #FF9400", +"N. c #FF9500", +"B. c #FF9600", +"V. c #F89903", +"C. c #F99E00", +"Z. c #FF9800", +"A. c #FF9900", +"S. c #FF9A00", +"D. c #FF9C00", +"F. c #FF9D00", +"G. c #FF9E00", +"H. c #FF9F00", +"J. c #FF9E05", +"K. c #EB9522", +"L. c #FDA700", +"P. c #FFA603", +"I. c #FFA504", +"U. c #FDA209", +"Y. c #FCA60E", +"T. c #FFA800", +"R. c #FFAA00", +"E. c #FFAD00", +"W. c #F8A115", +"Q. c #F9A215", +"!. c #FDA815", +"~. c #FFB000", +"^. c #FFB200", +"/. c #FFB301", +"(. c #FFB307", +"). c #FFB501", +"_. c #FFB600", +"`. c #FFB707", +"'. c #FFBE05", +"]. c #FFB90F", +"[. c #FCB31C", +"{. c #FFBE16", +"}. c #F1A62E", +"|. c #FCAF22", +" X c #FBB22E", +".X c #FFB82E", +"XX c #FFBF2E", +"oX c #F3B54B", +"OX c #F3B64B", +"+X c #F8BC4B", +"@X c #FFC60A", +"#X c #FFCA13", +"$X c #FFCD11", +"%X c #FFD417", +"&X c #FFD91F", +"*X c #FFDB1D", +"=X c #FFC020", +"-X c #FFC829", +";X c #FFC82B", +":X c #FFCD2E", +">X c #FFC33D", +",X c #FFDA2A", +"XkXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXqX9X9.v 9 FX", +"FXFXR n..XdX0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X7X2X3.l 4 FXFX", +"FXFXFXE f.Y.8X5X5X5X5X5X5X5X5X5X5X5X5X5X5X4X1X:X3.v > FXFXFX", +"FXFXFXFXD r.V.6X3X3X3X3X3X3X3X3X3X3X3X3X,X.I K &.I.R.~.~.A.m 2 FXFXFXFXFXFXFX", +"FXFXFXFXFXFX+.q.R.F.z.y.( H e 7 m V :.F.R.B.( 8 FXFXFXFXFXFXFX", +"FXFXFXFXFXFX .f.z.s.o.! k @ & q v A <.n.] d FXFXFXFXFXFXFX", +"FXFXFXFXFXo. .1.;.^ F - FXFX ; p g A ,.y # FXFXFXFXFXFXFX", +"FXFXFXFXFX . .) U 5 FXFXFXFXFXFX < y d y : FXFXFXFXFXFX", +"FXFXFXFXFXo.Y r o FXFXFXFXFXFXFXFXFXFX+ 1 t , FXFXFXFXFXFX", +"FXFXFXFXFXFX FXFXFXFXFXFXFXFXFXFXFXFX FXFXFXFXFXFX", +"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX", +"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX", +"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX" +}; --- kdebase-3.5.6.orig/debian/icons/kpersonalizer.xpm +++ kdebase-3.5.6/debian/icons/kpersonalizer.xpm @@ -0,0 +1,289 @@ +/* XPM */ +static char *kpersonalizer[] = { +/* columns rows colors chars-per-pixel */ +"32 32 251 2", +" c black", +". c #040F1F", +"X c #061802", +"o c #081C02", +"O c #051121", +"+ c #08182C", +"@ c #002C00", +"# c #0D2207", +"$ c #082D6E", +"% c #002270", +"& c #00257B", +"* c #00306C", +"= c #0C3473", +"- c #113C78", +"; c #004400", +": c #004C00", +"> c #084502", +", c #005000", +"< c #005C00", +"1 c #105204", +"2 c #0A6B02", +"3 c #0F7304", +"4 c #1C6F08", +"5 c #136311", +"6 c #126910", +"7 c #147C06", +"8 c #1C7813", +"9 c #267E0B", +"0 c #267921", +"q c #2E782F", +"w c #002884", +"e c #032F8B", +"r c #0B3C94", +"t c #0133A4", +"y c #0438A6", +"u c #063CA9", +"i c #0131BD", +"p c #0233C1", +"a c #0237C8", +"s c #13458C", +"d c #194E92", +"f c #0F47A2", +"g c #0B43AE", +"h c #0E49B2", +"j c #0D4BBD", +"k c #104BAD", +"l c #1453B6", +"z c #1555B9", +"x c #1659BB", +"c c #185BBD", +"v c #256CBD", +"b c #0641C1", +"n c #0643CB", +"m c #0D4DD0", +"M c #1F49C2", +"N c #1658C4", +"B c #1B5FC0", +"V c #185ACD", +"C c #0344E7", +"Z c #0648E1", +"A c #0347F4", +"S c #0549F5", +"D c #0349FF", +"F c #0A4FFF", +"G c #0C52FF", +"H c #1458E4", +"J c #1559ED", +"K c #1254FF", +"L c #1459FF", +"P c #1E65C3", +"I c #1E65CB", +"U c #1E64FF", +"Y c #256FC2", +"T c #216BC8", +"R c #2A6CC4", +"E c #2268D2", +"W c #2572CD", +"Q c #2874CB", +"! c #2771D2", +"~ c #2A7BD3", +"^ c #3178CC", +"/ c #3278D1", +"( c #307ED8", +") c #2469E7", +"_ c #276CEF", +"` c #2166FF", +"' c #276CFF", +"] c #2A6FFF", +"[ c #2F76E3", +"{ c #367CEE", +"} c #3379FE", +"| c #496FD2", +" . c #597DC3", +".. c #4075FE", +"X. c #4579FF", +"o. c #178006", +"O. c #1D8A08", +"+. c #23940A", +"@. c #309A19", +"#. c #328D25", +"$. c #359025", +"%. c #2BA00C", +"&. c #2FA212", +"*. c #31AA0E", +"=. c #3DAE1D", +"-. c #3DB517", +";. c #3FB120", +":. c #2F8470", +">. c #419327", +",. c #41A32A", +"<. c #44A82A", +"1. c #4CAF2D", +"2. c #4CA530", +"3. c #47BC23", +"4. c #59BB3A", +"5. c #4F8854", +"6. c #528B56", +"7. c #55886C", +"8. c #61BE44", +"9. c #72A373", +"0. c #7AA87C", +"q. c #4FC02C", +"w. c #59C637", +"e. c #2E80D3", +"r. c #3580D4", +"t. c #3388DC", +"y. c #3983D8", +"u. c #3C8CDC", +"i. c #358FE1", +"p. c #3D86E7", +"a. c #3C81FF", +"s. c #3993E3", +"d. c #5380C8", +"f. c #5885CC", +"g. c #5F9CDF", +"h. c #438BED", +"j. c #478CFE", +"k. c #4A87FF", +"l. c #4A8FFF", +"z. c #449CE7", +"x. c #449DE8", +"c. c #4A95EB", +"v. c #4F9EE5", +"b. c #4E9BEB", +"n. c #4E93FF", +"m. c #5589FF", +"M. c #5297FF", +"N. c #5B97FF", +"B. c #5A9FFF", +"V. c #4DA3EC", +"C. c #54A5ED", +"Z. c #58ABEF", +"A. c #5CA1FD", +"S. c #5CAEF0", +"D. c #6189CB", +"F. c #6792D2", +"G. c #6893D2", +"H. c #748CC9", +"J. c #709EDB", +"K. c #638FFE", +"L. c #609EE0", +"P. c #6498FF", +"I. c #719DFF", +"U. c #7BA4DB", +"Y. c #63A3E3", +"T. c #66A8E6", +"R. c #67AAE8", +"E. c #69ACE9", +"W. c #61A6FF", +"Q. c #66AAFF", +"!. c #6AABFC", +"~. c #66B2F2", +"^. c #6DB1FE", +"/. c #73A7FF", +"(. c #76AEFF", +"). c #7EA1FD", +"_. c #72B5FF", +"`. c #7BB7FF", +"'. c #78BDFF", +"]. c #7CC2FD", +"[. c #80B57B", +"{. c #82CE6A", +"}. c #93D97D", +"|. c #90BC8E", +" X c #9DBF9E", +".X c #87ACDD", +"XX c #91B7E6", +"oX c #96BFEB", +"OX c #8DC383", +"+X c #94CE85", +"@X c #97D385", +"#X c #98D587", +"$X c #9AD58B", +"%X c #A1CB9A", +"&X c #A5DD95", +"*X c #A5CCA0", +"=X c #ACDAA1", +"-X c #B4CAB7", +";X c #BBDFB2", +":X c #81C4FF", +">X c #89C5FF", +",X c #89CDFF", +"XkXHXGXGXV.,X]._._.3XHXHXHXHXHXHXHXDX|.8 7 7 3 0 XDXSX; ", +"C.7XGXHXHXHXkXS.:X:X7XGXHXHXHXHXHXHXHX*X$.+.+.O.#.%XHXHXDXBX; ", +"E.HXHXHXHXHXxX~.9XGXHXHXHXHXHXHXHX;X,.&.*.%.@.OXZXHXHXDXSXBX, ", +"E.HXHXHXHXHXkX1XHXHXHXHXHXHXHXHXdX=.q.-.=.+XFXHXHXHXDXDXSXbX, ", +"E.HXHXHXHXHXkXE.HXHXHXHXHXHXHXHX#Xw.3.{.FXHXHXHXHXDXDXSXSXbX, ", +"E.HXHXHXHXHXkXE.HXHXHXHXHXHXHXHX@X}.CXHXHXHXHXHXHXDXDXSXBXsX, ", +"R.HXHXHXHXHXkXE.HXHXHXHXHXHXHXHX@XHXHXHXHXHXHXHXHXDXSXBXBXsX, ", +"R.HXHXHXHXHXkXT.HXHXHXHXHXHXHXHX#XHXHXHXHXHXHXHXDXDXSXBXBXsX, ", +"T.HXHXHXHXHXjXT.HXHXHXHXHXHXHXDX#XHXHXHXHXHXHXHXDXSXBXBXbXsX, ", +"Y.HXHXHXHXHXjXT.HXHXHXHXHXHXDXHX#XHXHXHXHXHXHXDXSXSXBXBXbXaX: ", +"Y.HXHXHXHXGXjXY.HXHXHXHXHXHXDXDX$XCXHXHXHXHXDXDXSXBXMXbX0X5.: ", +"Y.HXHXHXHXHXrXY.HXHXHXHXHXHXDXDX$XdXHXHXHXHXDXSXBXBXqX6., @ ", +"Y.HXHXHXHXHXDXY.HXHXHXHXHXDXDXSX$XhXHXHXHXDXDXSXlX9.5 @ ", +"Y.HXHXHXHXDXDXY.HXHXHXHXDXDXDXSX#XgXHXHXHXDXmX[.8 > ", +"Y.HXHXGXDXpX .Y.HXHXHXHXHXDXwX .:.gXHXHXSX%X$.1 JXJX", +"J.GXHXzXG.z = L.HXHXHXHXpXf.k $ >.gXHX=X<.4 X JXJXJXJX", +"~ NXU.P - L.GXHXbXF.z = 2.&X8.9 o JXJXJXJXJXJX", +"~ ^ d O g.ZX.XR s O 4.1.# JXJXJXJXJXJXJXJX", +"v + r.^ d O JXJXJXJXJXJXJXJXJXJX", +" JXJXY + JXJX JXJXJXJXJXJXJXJXJXJXJXJX", +" JXJXJXJX JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX" +}; --- kdebase-3.5.6.orig/debian/icons/ktip-16.xpm +++ kdebase-3.5.6/debian/icons/ktip-16.xpm @@ -0,0 +1,97 @@ +/* XPM */ +static char *ktip-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 75 1", +" c black", +". c #010101", +"X c gray1", +"o c gray12", +"O c #26262B", +"+ c #2E2E32", +"@ c #2B2B52", +"# c #30305C", +"$ c #34345B", +"% c #444444", +"& c gray35", +"* c #525279", +"= c #656565", +"- c #5555A2", +"; c #5D5DA7", +": c #5E5FA8", +"> c #5F5FA8", +", c #6B6B96", +"< c #6363AA", +"1 c #6465AE", +"2 c #6566AE", +"3 c #6F6FB1", +"4 c #7171B3", +"5 c #7373B3", +"6 c #7476B9", +"7 c #7C7CB8", +"8 c gray51", +"9 c #929292", +"0 c #9F9F9F", +"q c #8D8FC9", +"w c #8F93CD", +"e c #9192C6", +"r c #9597CE", +"t c #9898C7", +"y c #9D9FD2", +"u c #9BA0D6", +"i c #9FA1D1", +"p c #A1A1CC", +"a c #A3A3CD", +"s c #A0A2D1", +"d c #A2A3D0", +"f c #A2A4D3", +"g c #A8A8D0", +"h c #AAAEDC", +"j c #B1B1C1", +"k c #B6BAE3", +"l c #B9BBE1", +"z c #BFC3E8", +"x c #C3C3CF", +"c c #D4D4DD", +"v c #C8C8E2", +"b c #CECFE8", +"n c #DDDDE4", +"m c #DADFF9", +"M c #DBE0FA", +"N c #DCE2FF", +"B c #DFE5FF", +"V c #E8E8ED", +"C c #E2E6FA", +"Z c #E1E7FF", +"A c #E2E8FF", +"S c #E3E8FF", +"D c #E5E9FC", +"F c #E6EBFF", +"G c #EDEDF1", +"H c #E8EDFF", +"J c #E9EDFF", +"K c #EAEDFF", +"L c #F0F3FF", +"P c #F3F5FF", +"I c #F6F8FF", +"U c #FBFCFF", +"Y c #FCFDFF", +"T c gray100", +"R c None", +/* pixels */ +"RRRRptyrq3PPKPP:-RRRR", +"RRRR-bIIIb-RRRRR", +"RRRR-vTTUv-RRRRR", +"RRRR-,*$@#-RRRRR", +"RRRR90Vnx+ RRRRR", +"RRRR=8VcjO RRRRR", +"RRRRRO&%X RRRRRR" +}; --- kdebase-3.5.6.orig/debian/icons/kjobviewer.xpm +++ kdebase-3.5.6/debian/icons/kjobviewer.xpm @@ -0,0 +1,168 @@ +/* XPM */ +static char *kjobviewer[] = { +/* columns rows colors chars-per-pixel */ +"32 32 130 2", +" c black", +". c gray5", +"X c #131313", +"o c #2F2F2F", +"O c #343434", +"+ c #3B3B3B", +"@ c #3F3F49", +"# c #434343", +"$ c #4A4A4A", +"% c #525252", +"& c #5B5B5C", +"* c #5D5D60", +"= c #5D5D6B", +"- c #616162", +"; c #6D6D72", +": c #767676", +"> c #7C7C7E", +", c #036DFA", +"< c #0A6EF3", +"1 c #007CFF", +"2 c #1370ED", +"3 c #1C73E8", +"4 c #2075E6", +"5 c #2B79E1", +"6 c #757587", +"7 c #7D7D86", +"8 c #7B7B8E", +"9 c #0186F5", +"0 c #008EFF", +"q c #198AE3", +"w c #1687FF", +"e c #1698FF", +"r c #14A0FE", +"t c #3B81DF", +"y c #3FB2FE", +"u c #678EB5", +"i c #7587A0", +"p c #428BCB", +"a c #4285DF", +"s c #4E8DD6", +"d c #538FE0", +"f c #5B94E1", +"g c #4BB5FD", +"h c #6C9AC7", +"j c #6EA0E3", +"k c #60B9FF", +"l c #76A4E3", +"z c #6BC3FD", +"x c #7CC0F4", +"c c #838388", +"v c #8A8A8F", +"b c #838392", +"n c #86869B", +"m c #8F8F91", +"M c #949497", +"N c #93939A", +"B c #99999C", +"V c #8C8CA1", +"C c #8A98A7", +"Z c #9494A3", +"A c #9595AB", +"S c #9A9AA6", +"D c #9D9DAA", +"F c #9B9BB0", +"G c #80A4A0", +"H c #91B8AD", +"J c #A5A5AC", +"K c #A9A9AB", +"L c #A6A6B0", +"P c #A8A8B2", +"I c #ADADB8", +"U c #A7B2BF", +"Y c #B3B3BC", +"T c #BEBEBF", +"R c #87A5C7", +"E c #85B6E2", +"W c #A2B3C9", +"Q c #B2B2C4", +"! c #B5B5C8", +"~ c #B4BDC7", +"^ c #BCBCC5", +"/ c #BCBCCC", +"( c #86CCFB", +") c #8ACEFC", +"_ c #94D3FD", +"` c #B7C5C9", +"' c #AAC2E3", +"] c #A4D9FC", +"[ c #B7CDE9", +"{ c #BACFE9", +"} c #BDD1EB", +"| c #B2DEFC", +" . c #B6E0FD", +".. c #C3C3C3", +"X. c #C4C4CE", +"o. c #CACACC", +"O. c #C4C4D2", +"+. c #CACAD5", +"@. c #CDCDD9", +"#. c #D0D0D6", +"$. c #D3D3DC", +"%. c #DBDBDC", +"&. c #C5D2E7", +"*. c #C3D4EB", +"=. c #C7D9EE", +"-. c #CCD4E4", +";. c #CBDAEE", +":. c #D6D6E1", +">. c #DBDBE3", +",. c #DDDFE8", +"<. c #D1DEF0", +"1. c #CBE6FA", +"2. c #CFE8FA", +"3. c #DEE4ED", +"4. c #D3E0F0", +"5. c #D3EAFA", +"6. c #DAE5F3", +"7. c #DBEEFB", +"8. c #E0E0E4", +"9. c #E3E3EA", +"0. c #E9E9EE", +"q. c #E3EAF3", +"w. c #ECECF1", +"e. c #EAF1F7", +"r. c #EDF3F8", +"t. c #F1F2F5", +"y. c #F3F5F9", +"u. c #F5F8FB", +"i. c #FDFDFE", +"p. c None", +/* pixels */ +"p.p.p.p.p.p.p.p.F Q / / / / / / / / / / / / D p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.i.i.i./ p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.u.y.i./ p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.Z ,.i.i.i.i.i.i.i.i.u.u.y.i.^ p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.n 8.i.i.i.i.i.i.u.u.y.y.r.i.! p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.n ,.i.i.i.i.i.u.u.u.y.r.e.u.Y p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.8 ,.i.i.i.i.i.u.u.y.r.r.e.u.Y p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.8 %.i.i.i.i.u.u.y.r.r.e.q.u.I p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.p.6 %.i.i.i.u.u.u.r.r.e.q.q.y.P p.p.p.p.p.p.p.p.", +"p.p.p.p.p.p.p.$ * $.i.u.u.u.r.r.r.e.q.q.3.y.L + p.p.p.p.p.p.p.p.", +"p.p.p.p.p.$ $ $ v $.i.u.u.r.r.e.e.q.q.3.3.w.P : # $ $ p.p.p.p.p.", +"p.p.$ $ > Y +.:.M $.u.y.y.r.r.e.q.q.3.3.,.y.D o.$.O.J ; # $ p.p.", +"p.$ J ,.,.9.,.9.v #.y.q.6.4.=.} { } &.-.-.w.D ..9.,.3.3.%.> o p.", +"$ ; 9.,.9.9.9.0.i [ } *.;.4.6.6.6.3.<.=.*.} ' K $.#.$.%.:.:.# ", +"$ #.0.0.9.9.0.0.R 7.7.7.7.7.7.7.7.5.5.5.1.1.1.C @.@.` H @.@.c X ", +"$ 0.0.0.0.0.0.%.E . . . . .] _ ( ( ( ( ( ( ( u >.:.` i :.$.^ O ", +"$ w.w.w.w.0.8.o.x _ _ ) z g g g g g g g g g g p 9.>.%.%.:.:.#.O ", +"* w.w.w.0.8.>.U z z y e r r r e e r r r e e r q %.3.3.>.>.,.>.+ ", +"* 0.t.0.9.9.,.h z e 0 0 0 0 0 0 0 0 0 0 0 0 0 9 #.8.9.9.0.9.o.# ", +"& Q / >.w.w.w.s w 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 W 0.0.0.@.! Z # ", +"* Q Q Q Q / :.' j d t 5 3 2 < , , < 2 4 5 a f l -.+.! Q Q Q D @ ", +"% ! ! ! ! Q Q ! ! ! ` +.@.@.:.,.>.%.@.+.@.` ! ! ! ! ! ! ! ! Z O ", +"% Q / / / Q 7 7 7 7 7 7 7 7 c 7 7 7 7 7 7 7 7 7 8 b / / / / N O ", +"% I O.O.O.L + + + + + @ + + + + + + + + + + + + + % O.O.O.O.m o ", +"% L @.@.@.P $ % ..............................K $ * o.@.@.@.7 X ", +"& b :.:.:.^ M K %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.c B #.:.:.$.& ", +"p.* >.9.9.9.@.9.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.O.,.9.9.9.Y # ", +"p.% M #.9.9./ i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.0./ 9.$.T ; . p.", +"p.p.. # $ * +.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.i.Z $ # X p.", +"p.p.p.p.p.A t.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.w.t.X.@ p.p.p.p.p.", +"p.p.p.p.p.Y i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.y.u.y.= p.p.p.p.p.", +"p.p.p.p.F Q @.@.@.@.@.@.@.@.@.@.@.@.@.X.X./ ..^ Y Y ; p.p.p.p." +}; --- kdebase-3.5.6.orig/debian/icons/kcontrol.xpm +++ kdebase-3.5.6/debian/icons/kcontrol.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *kcontrol[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #000000", +". c #0C0C0C", +"X c #001200", +"o c #001A00", +"O c gray8", +"+ c #1B1B1B", +"@ c #002500", +"# c #002900", +"$ c #232323", +"% c #2C2C2C", +"& c #343434", +"* c #3A3A3A", +"= c #1C5019", +"- c #0E740E", +"; c #196E17", +": c #257601", +"> c #337D6D", +", c #444544", +"< c #4C4C4C", +"1 c #57565B", +"2 c #505050", +"3 c #4B7744", +"4 c #646464", +"5 c #7B797B", +"6 c #747376", +"7 c #697068", +"8 c #003BAA", +"9 c #0441AC", +"0 c #0B4AB3", +"q c #104EB3", +"w c #1452B6", +"e c #1255BC", +"r c #1C5BBC", +"t c #1459B6", +"y c #1C63BC", +"u c #2A59AC", +"i c #275AAD", +"p c #2160BF", +"a c #266FBF", +"s c #3666B5", +"d c #1D60C2", +"f c #2464C2", +"g c #2866C4", +"h c #2B6AC5", +"j c #2C6DC8", +"k c #2D70CB", +"l c #2E77C5", +"z c #3373CB", +"x c #3878CE", +"c c #3679CB", +"v c #3B7CD0", +"b c #3176D0", +"n c #446AAA", +"m c #406FBD", +"M c #4172BB", +"N c #526FA2", +"B c #5C76AB", +"V c #507AB7", +"C c #617AAF", +"Z c #427ED0", +"A c #4576C1", +"S c #129911", +"D c #109710", +"F c #089308", +"G c #1C833C", +"H c #08A100", +"J c #12AA00", +"K c #18A402", +"L c #1DA212", +"P c #3D8A18", +"I c #20853C", +"U c #2F852A", +"Y c #21AB0B", +"T c #2BB415", +"R c #39B72D", +"E c #36B334", +"W c #388B52", +"Q c #3DC80C", +"! c #47883F", +"~ c #40A836", +"^ c #5D986F", +"/ c #57B64B", +"( c #5DB35C", +") c #54B254", +"_ c #58AC4B", +"` c #6C9A58", +"' c #6EBD4C", +"] c #64BB5A", +"[ c #70BE4D", +"{ c #77B456", +"} c #6B8D6B", +"| c #45CA17", +" . c #4CD413", +".. c #56D326", +"X. c #4DC531", +"o. c #64E02F", +"O. c #58C54C", +"+. c #62CE46", +"@. c #62CB49", +"#. c #69CA55", +"$. c #73D25A", +"%. c #6BD646", +"&. c #6AC569", +"*. c #6FC86F", +"=. c #71CD68", +"-. c #78CA77", +";. c #79D461", +":. c #79D663", +">. c #3E80D3", +",. c #4492AF", +"<. c #5C82BA", +"1. c #58A0B4", +"2. c #718EBB", +"3. c #6E8BB9", +"4. c #4381CF", +"5. c #4384D5", +"6. c #4789D7", +"7. c #4688D9", +"8. c #4A8CDA", +"9. c #4587D7", +"0. c #4E90DC", +"q. c #4991D3", +"w. c #5987C5", +"e. c #508DD8", +"r. c #5293DD", +"t. c #4D92E0", +"y. c #5396E0", +"u. c #5A9BE2", +"i. c #579BE4", +"p. c #5DA0E6", +"a. c #5CA2EA", +"s. c #6794CA", +"d. c #6D9CD1", +"f. c #7095C7", +"g. c #6299EA", +"h. c #6691FB", +"j. c #73A3D5", +"k. c #7CACDA", +"l. c #63A2E5", +"z. c #62A6EA", +"x. c #65A9EC", +"c. c #68AEF1", +"v. c #6CB3F4", +"b. c #857587", +"n. c #849E7D", +"m. c #81A954", +"M. c #80AA57", +"N. c #85AB47", +"B. c #9ABD60", +"V. c #8AAB7A", +"C. c #8ED84E", +"Z. c #82DA64", +"A. c #85DA6A", +"S. c #8ADA76", +"D. c #96D071", +"F. c #90ED5E", +"G. c #8EEA5D", +"H. c #92E96A", +"J. c #97E775", +"K. c #98F162", +"L. c #A2FF5B", +"P. c #BFE37C", +"I. c #A3F668", +"U. c #E7DA5D", +"Y. c #FFE161", +"T. c #FFEF7F", +"R. c #8B8B8B", +"E. c gray52", +"W. c gray62", +"Q. c #938D95", +"!. c #9780A1", +"~. c #9F9BA0", +"^. c #88A986", +"/. c #8EB08E", +"(. c #96BA8C", +"). c #9BBD9B", +"_. c #A2A2A2", +"`. c #A7AAA6", +"'. c #B2BFAD", +"]. c #B2B2B2", +"[. c #BCBCBD", +"{. c #B7B4B9", +"}. c #A7BFA3", +"|. c #829FC8", +" X c #81B2DE", +".X c #9FACC2", +"XX c #84B5E0", +"oX c #A3ABC0", +"OX c #A4BADE", +"+X c #A4B9E0", +"@X c #9EC09E", +"#X c #94DD88", +"$X c #83D283", +"%X c #9DE688", +"&X c #A1DB8A", +"*X c #A3D097", +"=X c #A7C9A3", +"-X c #BCC0BC", +";X c #A5EB88", +":X c #ABE895", +">X c #AAF68A", +",X c #B1EB98", +".7.t.i.a.x.c.v.v.v.c.z.a.y.t.>.>.b e OXPXFX& YXYXYXYX", +"[.PXAXs b >.7.0.y.u.a.x.x.x.x.z.p.y.t.8.>.v b f 5XPXFX& YXYXYXYX", +"-XPXAXM j v 5.7.0.r.u.p.p.p.l.u.y.t.8.7.>.x k f OXUXvX* YXYXYXYX", +"kXPXSXs j c v >.6.8.0.r.y.r.r.r.8.7.>.v b k f e OXGXAX& YX6 R.$ ", +"kXPXDXu r z z x Z 5.6.e.e.6.6.6.d.f.f.f.<.<.<.n .XzX8X4 , ].LX* ", +"kXPXDXu 8 r j z x v v 5.5.5.5.Z cXZXVXVXVXBXBXBXbXcXbXGXKXIXLX& ", +"zXPXFXu 8 8 w p j z z x x x x x f.|.d.2.3.B B B ].oX8X5 1 1 1 + ", +"zXPXFXu 8 0 q w p p h h j j j h y > ^ W ; G G G _ ' #.P : : X ", +"lXPXHXs 9 w r r p p g h a h h g t { hXCXeXrXaXtXwXwXwXtXCXL.# YX", +"lXPXLXs q r p g h j z z z z z j p m.hXjX1XdXsXjXyXyXyXwXwXI.# YX", +"lXPXHXm e p g j z x x x Z Z x v h M.gXrX2X;X%XyXyXMXXaX7XK.# YX", +"cXPXFXA d j z x 5.6.8.8.0.0.0.8.c M.fXqX%X*X2X;XH.wX>XpX7XK.# YX", +"cXPXJXw.j Z 6.8.r.r.p.l.l.l.l.g.q.{ Y.aXeX'.{.9X,X,XH.iX6XG.# YX", +"cXPXIXJXJXFXHXHXFXHXDXDXDXDXSXSXxXB.fXP.#Xn.Q.*XJ.J.;XqX0XG.# YX", +"W.PXPXPXPXIXLXLXFXFXGXSXBXVXvXvXzXD.gXC.X.$.&XS.,XH.H.&X9X&X# YX", +"+ `.AXvXvXvXbXcXvXvXbXnXcXcXcXcX-XN.U.0XO.=.&XS.A.%.J.V.!.(.# YX", +"YX + $ + + + * _.xXzXzXkXkXkX[.-X^.! ] h.h.#XA.Z.Z.:X[ ` ' # YX", +"YXYXYXYXYX& R.bXvXbXUXGXFXDXDXDXFXFX/.] 1.,.S.$.$.Z.Z...o. .# YX", +"YXYXYXYX% vXPXPXPXAXAXLXIXIXIXLXAXbX).] R T =.@.$.$.$.....| # YX", +"YXYXYXYX5 PXPXIXLXLXAXvXvXAXvXnXlXbX/.( E E }.*X#.(.=X..| Q @ YX", +"YXYXYXYX* AXIXLXUXFXFXDXSXBXmXBXAXLX@X( E U b.-X' 7 ~.$.%.Q @ YX", +"YXYXYXYX < {.AXFXFXFXDXDXFXDXGXFXLX).( E ; 2 _./ , 5 #.S.+.@ YX", +"YXYXYXYXYX O 2 R.].kXlXbXbXbXnXlX8X} ( E - < ^./ = 3 Y +.#.@ YX", +"YXYXYXYXYXYXYX . % * , , , , & + o ( E D -.$XE H J J #.O.# YX", +"YXYXYXYXYXYXYXYXYXYXYX YXX ) $X&.*.*.=.=.=.=.#XX.# YX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXo F S S S S S S L L Y K # YX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX X o o o o o o o o o o YX" +}; --- kdebase-3.5.6.orig/debian/icons/klipper.xpm +++ kdebase-3.5.6/debian/icons/klipper.xpm @@ -0,0 +1,202 @@ +/* XPM */ +static char *klipper[] = { +/* columns rows colors chars-per-pixel */ +"32 32 164 2", +" c black", +". c #180E08", +"X c #353541", +"o c #452817", +"O c #633A20", +"+ c #6A3E23", +"@ c #744E17", +"# c #734425", +"$ c #7D4A25", +"% c #4B4B5A", +"& c #76767A", +"* c #7F7F77", +"= c #7B7B7D", +"- c #646484", +"; c #70708B", +": c #7D7D81", +"> c #737390", +", c #7A7A95", +"< c #7E7E98", +"1 c #865227", +"2 c #8F5927", +"3 c #976028", +"4 c #A06728", +"5 c #A96E29", +"6 c #B27429", +"7 c #BB7B29", +"8 c #826B56", +"9 c #8B6F78", +"0 c #8E786D", +"q c #8E727A", +"w c #977C64", +"e c #90767B", +"r c #947A7E", +"t c #B07650", +"y c #D4710D", +"u c #DC750B", +"i c #DC7B0E", +"p c #838379", +"a c #8B8B7D", +"s c #D48C1B", +"d c #DC8312", +"f c #DC8A16", +"g c #DC8E18", +"h c #DC941A", +"j c #DC981D", +"k c #C78727", +"l c #C28129", +"z c #CA872A", +"x c #CC8A28", +"c c #D28E2A", +"v c #D5902A", +"b c #DC9D20", +"n c #D69F38", +"m c #DCA423", +"M c #DFAD27", +"N c #E1971B", +"B c #E49C1C", +"V c #FF8602", +"C c #FF8B04", +"Z c #FF9007", +"A c #FF9409", +"S c #FF9B0D", +"D c #E7A21E", +"F c #FFA00F", +"G c #FFA311", +"H c #FFAA15", +"J c #FFAF18", +"K c #FFB31A", +"L c #FFBB1E", +"P c #EAA620", +"I c #ECAA21", +"U c #E1B32A", +"Y c #E3BA2C", +"T c #EEB928", +"R c #D69F4B", +"E c #C89F65", +"W c #E5C02F", +"Q c #E7C632", +"! c #EACD34", +"~ c #ECD337", +"^ c #EED939", +"/ c #FFC423", +"( c #FFCE28", +") c #FFD42B", +"_ c #FFDA2E", +"` c #F0DB3A", +"' c #FFE333", +"] c #FFEC38", +"[ c #FFF33C", +"{ c #FFF93F", +"} c #ECD843", +"| c #FFFE42", +" . c #F4F351", +".. c #FAF954", +"X. c #E9E961", +"o. c #F4F467", +"O. c #F9F165", +"+. c #FFFF68", +"@. c #858589", +"#. c #85859E", +"$. c #8C8C91", +"%. c #9B8382", +"&. c #909093", +"*. c #96969A", +"=. c #9C9C9D", +"-. c #8787A0", +";. c #8E8EA5", +":. c #9696AB", +">. c #9898AD", +",. c #A18B86", +"<. c #A69189", +"1. c #AB938C", +"2. c #AE9B8E", +"3. c #B19690", +"4. c #B39C92", +"5. c #B99F95", +"6. c #B5A392", +"7. c #B3AA96", +"8. c #BAA495", +"9. c #BEA699", +"0. c #BCA996", +"q. c #B6B19A", +"w. c #B8B59C", +"e. c #BBB99E", +"r. c #A3A3A8", +"t. c #A9A9AF", +"y. c #A2A2B5", +"u. c #B1B1B7", +"i. c #B5B5BC", +"p. c #BCBCC1", +"a. c #BDBDD0", +"s. c #C2AB9B", +"d. c #C6B29D", +"f. c #C7B89D", +"g. c #CABC9F", +"h. c #CEC2A3", +"j. c #D2C9A6", +"k. c #D5CDA8", +"l. c #D7D1AA", +"z. c #DAD5AC", +"x. c #DCD9AF", +"c. c #DFDDB1", +"v. c #F9F181", +"b. c #C5C5CA", +"n. c #C8C8CC", +"m. c #C3C3D3", +"M. c #CBCBD5", +"N. c #CDCDDA", +"B. c #D2D2D7", +"V. c #D3D3DC", +"C. c #D9D9DE", +"Z. c #CFCFE0", +"A. c #D3D3E2", +"S. c #DADAE1", +"D. c #DFDFEC", +"F. c #E0E0E5", +"G. c #E2E2ED", +"H. c #E8E8EE", +"J. c #E6E6F0", +"K. c #EBEBF2", +"L. c #F1F1F5", +"P. c #F4F4F9", +"I. c #FEFEFE", +"U. c None", +/* pixels */ +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.#.#.-.-.-.#.#.#.#.#.% U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.< < >.P.I.I.I.I.I.P.>., X U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.c c x w > ;.L.I.P.I.P.P.I.P.L.;.; 8 k x z U.U.U.U.", +"U.U.U.c c v v v 0 :.K.K.L.K.K.K.L.H.L.H.L.:.0 c v v x @ U.U.U.", +"U.U.U.z R v.+.+.a y.F.F.F.F.F.F.F.F.F.F.F.y.a +.+.O.n l U.U.", +"U.U.U.l } | ..o.p >.V.V.B.B.V.V.B.V.V.V.B.>.p X. .| ` l U.U.", +"U.U.U.7 ^ { c.F.#.- > > > > > ; > > > > ; - , a.e.| T 7 U.U.", +"U.U.U.6 ~ [ x.L.L.B.C.B.V.V.V.N.N.N.m.m.m.a.A.Z.w.] I 6 U.U.", +"U.U.U.5 ~ ] z.L.I.I.I.I.I.I.I.P.L.L.K.K.J.G.G.Z.q.) P 5 U.U.", +"U.U.U.4 Q ' k.L.I.I.I.I.= =.I.P.L.L.K.K.J.G.D.N.7.L D 4 U.U.", +"U.U.U.3 Y ' k.L.I.I.I.I.p =.I.P.L.L.K.J.G.G.D.A.2.K B 3 U.U.", +"U.U.U.2 Y _ j.L.I.I.I.I.= r.P.P.L.L.K.K.G.D.D.D.2.J N 2 U.U.", +"U.U.U.1 U ) h.L.I.I.I.I.= =.I.P.L.S.u.p.D.D.D.D.1.J N 1 U.U.", +"U.U.U.$ M ( h.K.I.I.I.I.= =.I.P.b.& ; N.G.D.D.D.<.J N $ U.U.", +"U.U.U.# m ( g.K.I.I.I.I.= r.I.b.= : B.G.G.G.G.D.<.H h # U.U.", +"U.U.U.# m / g.H.I.I.I.I.: =.p.& $.S.J.J.J.D.G.D.,.H g # U.U.", +"U.U.U.# j L f.H.I.I.I.P.& & & & t.J.J.J.J.J.G.G.%.G f # U.U.", +"U.U.U.# j K d.H.I.P.P.P.= & $.$.& N.K.J.J.J.J.J.%.G f # U.U.", +"U.U.U.# h J 0.G.P.I.P.P.= &.L.S.: @.J.K.J.J.J.J.%.G d # U.U.", +"U.U.U.# g H 0.I.I.I.P.P.= *.P.L.i.= r.K.J.J.J.J.%.S d # U.U.", +"U.U.U.# f H 8.I.I.P.P.I.= *.P.L.L.*.= n.K.K.K.K.r A d # U.U.", +"U.U.U.# d K 6.I.I.I.I.I.= =.P.P.P.F.: : J.K.J.K.r A d # U.U.", +"U.U.U.# g K 6.I.I.I.I.P.C.S.I.P.P.P.S.B.F.L.K.K.q Z i # U.U.", +"U.U.U.# j J 6.I.I.I.I.I.P.I.P.P.P.P.P.P.L.L.K.K.q Z i # U.U.", +"U.U.U.# j J 2.I.I.I.I.I.I.I.I.P.P.P.P.P.L.L.L.L.9 Z i # U.U.", +"U.U.U.# h J E d.d.d.s.s.9.9.9.8.5.4.4.3.3.3.1.1.t C u # U.U.", +"U.U.U.# s H H H G G F F S S A S A A A Z Z C C C C V y # U.U.", +"U.U.U.# $ g G G G G F S S S S A A A Z Z C C C V V u $ + U.U.", +"U.U.U.o + # # # # # # # # # # # # # # # # # # # # # O . U.U.", +"U.U.U. U.U.", +"U.U.U.U. U.U.U." +}; --- kdebase-3.5.6.orig/debian/icons/kfind.xpm +++ kdebase-3.5.6/debian/icons/kfind.xpm @@ -0,0 +1,224 @@ +/* XPM */ +static char *kfind[] = { +/* columns rows colors chars-per-pixel */ +"32 32 186 2", +" c black", +". c #381E06", +"X c #4F4F74", +"o c #545477", +"O c #56567B", +"+ c #5B5A7E", +"@ c #5F5E82", +"# c #5E658F", +"$ c #4B69AD", +"% c #5167A2", +"& c #526CAC", +"* c #605E80", +"= c #636284", +"- c #63668B", +"; c #66698B", +": c #686788", +"> c #6B6A8A", +", c #6E6E90", +"< c #6F7294", +"1 c #6F799F", +"2 c #74728F", +"3 c #757492", +"4 c #757896", +"5 c #7F7E9B", +"6 c #6A76A4", +"7 c #7593CB", +"8 c #77ABF7", +"9 c #83460C", +"0 c #965208", +"q c #945D24", +"w c #8E6035", +"e c #AA6B0C", +"r c #BB6F08", +"t c #A46A2D", +"y c #A46B31", +"u c #A97030", +"i c #B4792D", +"p c #866045", +"a c #D07D02", +"s c #B08350", +"d c #B89675", +"f c #DC8501", +"g c #DF921A", +"h c #D9982F", +"j c #E6A134", +"k c #E5A238", +"l c #E9A73D", +"z c #ECAD37", +"x c #FFB935", +"c c #FFBB39", +"v c #C69C6C", +"b c #D6A45B", +"n c #EBB85D", +"m c #E5B878", +"M c #F4C44E", +"N c #F9CF5C", +"B c #F9D05C", +"V c #F6CC72", +"C c #81819D", +"Z c #848C9D", +"A c #918C9F", +"S c #90949D", +"D c #8386A3", +"F c #8788A4", +"G c #8A8AA5", +"H c #8D8EA9", +"J c #8E90AA", +"K c #8394B1", +"L c #8890B7", +"P c #9494AD", +"I c #9896AE", +"U c #9A9AB2", +"Y c #9CA0B7", +"T c #A38C81", +"R c #AC9FA0", +"E c #A09FB6", +"W c #A2A2B6", +"Q c #A5A6BB", +"! c #A9A9BC", +"~ c #91A3C3", +"^ c #99A9C4", +"/ c #8EB5E2", +"( c #84B2F5", +") c #87BDFA", +"_ c #89B5F7", +"` c #A1ADC4", +"' c #A3ABCE", +"] c #AAABC0", +"[ c #A5B1C4", +"{ c #ACB0C7", +"} c #AEB9D6", +"| c #AEBEDD", +" . c #B1B1C3", +".. c #B5B7CA", +"X. c #B4BACF", +"o. c #BABACC", +"O. c #B5BDD0", +"+. c #ABBCE0", +"@. c #99C0F5", +"#. c #9AC4FB", +"$. c #9EC9FE", +"%. c #B5C3DC", +"&. c #BAC0D5", +"*. c #BBC6DE", +"=. c #A2C2ED", +"-. c #A5C4F4", +";. c #A3CAF6", +":. c #A6CAFE", +">. c #A4D0FE", +",. c #AFD0F3", +"<. c #ABD2FE", +"1. c #ADD9FD", +"2. c #B5C5E0", +"3. c #BDCAE2", +"4. c #B8CFEE", +"5. c #B8D0ED", +"6. c #B3D4FE", +"7. c #B0DCFF", +"8. c #BADBFF", +"9. c #B6E0FE", +"0. c #BDE5FE", +"q. c #CCBDB1", +"w. c #C1BFCF", +"e. c #FFE696", +"r. c #FFE897", +"t. c #FFE99C", +"y. c #FFFDB3", +"u. c #FFFEB8", +"i. c #C2C0CF", +"p. c #C4C3D2", +"a. c #C5C8D7", +"s. c #C3C9DB", +"d. c #CACAD7", +"f. c #CACCDA", +"g. c #C8D0DF", +"h. c #D3D3DE", +"j. c #DBD4D2", +"k. c #DAD8DD", +"l. c #C1CEE4", +"z. c #C4D0E5", +"x. c #C4D2E9", +"c. c #CBD1E2", +"v. c #CAD6EA", +"b. c #CED9EC", +"n. c #C2DFFF", +"m. c #CEDAF0", +"M. c #D5D7E2", +"N. c #D1DEE6", +"B. c #D2DBED", +"V. c #DCDBE2", +"C. c #DADFEE", +"Z. c #D3DEF0", +"A. c #C4E2F5", +"S. c #C3E4FE", +"D. c #C4EAFF", +"F. c #C8E4FF", +"G. c #CBEAFE", +"H. c #CDF0FF", +"J. c #D6E0F2", +"K. c #D3EDFE", +"L. c #DBE4F3", +"P. c #DBE6F8", +"I. c #DBE9F3", +"U. c #DEE8FA", +"Y. c #D4F4FF", +"T. c #DCF5FE", +"R. c #DEF9FF", +"E. c #E6DBD0", +"W. c #E1DEDB", +"Q. c #E4E0DC", +"!. c #E2E2E9", +"~. c #EBEBEF", +"^. c #E0E7F6", +"/. c #E1E9F6", +"(. c #E3EBF9", +"). c #EBEEF3", +"_. c #E8EEFB", +"`. c #E4F9FE", +"'. c #ECF1F4", +"]. c #EBF2FD", +"[. c #EDFCFE", +"{. c #F3F3F6", +"}. c #F0F6FE", +"|. c #F4FAFE", +" X c #FEFEFE", +".X c None", +/* pixels */ +".X.X.X.X.X.X.Xz.z.z.z.z.z.z.z.z.z.z.z.z.z.z.Y .X.X.X.X.X.X.X.X.X", +".X.X.X.X.X.X.Xz. X X X X X X X X X X|.].(.J.x.[ .X.X.X.X.X.X.X.X", +".X.X.X.X.X.X.Xz. X X X X X X X X X X}.].^.Z.3.].[ .X.X.X.X.X.X.X", +".X.X.X.X.X.X.Xz. X X X X X X X X X X|.]._.J.z.}.U.[ .X.X.X.X.X.X", +".X.X.X.X.X.X.Xz. X X X X X X X X X X|.}._.L.z. X_.P.[ .X.X.X.X.X", +".X.X.X.X.X.X.Xz. X X X X X X X X X X X}.].^.z. X X].U.[ .X.X.X.X", +".X.X.X.X.X.X.Xz. X X X{.V.k.k.V.~.{. X|.].(.3.}.]./.P.A.Y .X.X.X", +".X.X.X.X.X.X.Xz. X XM.] ...&.i.&.d.). X}._.v.^ ^ ^ ^ ^ ^ ^ .X.X", +".X.X.X.X.X.X.Xz.'.! U ! X.s.g.g.a.a.&.h.}.]._./.J.l.%.%.| K .X", +".X.X.X.X.X.X.X*.I I ` A.T.`.[.|.[.I.f.p.f.].(.^.v.3.3.2.%.K .X", +".X.X.X.X.X.X.XH G ~ 0.Y.R.`.[.[.[.`.Y.f.p.M._.B.c.z.l.l.3.K .X", +".X.X.X.X.X, , C K 1.D.Y.T.R.`.`.`.R.T.G.a.p.B.B.v.v.x.c.x.K .X", +".X.X.X.X.X: > 5 / 1.0.H.Y.Y.T.T.T.Y.H.0.5.i.a.B.b.b.v.v.v.K .X", +".X.X.X.X.X: 3 6 ) 1.8.0.G.H.Y.T.Y.H.D.9.,.&.p.J.Z.Z.B.B.m.K .X", +".X.X.X.X.X: 2 & 8 #.1.8.0.D.D.D.0.0.8.1.;.| d.J.J.J.Z.Z.Z.K .X", +".X.X.X.X.X* > $ _ #.:.<.7.8.8.8.7.<.>.>.#.| i.L.L.L.J.J.J.K .X", +".X.X.X.X.X@ : % _ :.<.8.n.F.F.n.n.6.<.:.) O.w.^.^.L.L.L.J.K .X", +".X.X.X.X.XO @ # ( <.n.n.K.K.K.Y.G.S.6.<.-.X.w././.^.^.L.P.K .X", +".X.X.X.X.Xo o = 7 8.S.K.T.`.`.`.T.K.n.6.| .s.(.(.(.^.^.P.K .X", +".X.X.X.X.X.XX @ - +.G.T.`.[.[.[.`.T.K.4.] ] C._.(./.^.^.U.K .X", +".X.X.X.X.X.X.XD @ 6 4.T.[.|. X X}.`.x.{ Q ' W.(.(.(.^.^.U.K .X", +".X.X.X.X.X.X.Xz.D @ < ` N.'.'.'.L.X.U P W ' q.m E./.U.(.U.K .X", +".X.X.X.X.X.X.Xz. X! > = 4 P Q Y H J P F L A s z l Q././.U.K .X", +".X.X.X.X.X.X.Xl. X X!.E F 5 C F I o./.}.R w n y.B j W.(.U.K .X", +".X.X.X.X.X.X.Xz. X X X X|.'.'.].|.|.}.}.d r c t.u.B k W.U.K .X", +".X.X.X.X.X.X.Xz. X X X X X|. X|.}.}.}.[.j.u f x e.u.N j W.K .X", +".X.X.X.X.X.X.Xz. X X X X|. X|.|.|.}.}.}.].!.t f c e.u.N k S .X", +".X.X.X.X.X.X.Xz. X X X|. X|.|.|.|.|.}.}.].].V.y f c e.u.B h e .X", +".X.X.X.X.X.X.Xz.|. X X X X|. X|.}.|.}.}.].]._.k.t f c r.u.M g ", +".X.X.X.X.X.X.Xz.K K K K K K K K K K K K K K K K Z q f c V b v ", +".X.X.X.X.X.X.X.X . 0 a i T P ", +".X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X9 0 p 3 ; " +}; --- kdebase-3.5.6.orig/debian/icons/keditbookmarks-16.xpm +++ kdebase-3.5.6/debian/icons/keditbookmarks-16.xpm @@ -0,0 +1,198 @@ +/* XPM */ +static char *keditbookmarks-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 176 2", +" c black", +". c #020000", +"X c #030100", +"o c #050000", +"O c #050100", +"+ c #060100", +"@ c #080100", +"# c #0B0200", +"$ c #120600", +"% c #220B00", +"& c #290900", +"* c #2A0E00", +"= c #2F0E00", +"- c #390E00", +"; c #3B0F00", +": c #3B1300", +"> c #391500", +", c #3C1500", +"< c #461400", +"1 c #4B1500", +"2 c #4F1700", +"3 c #4F1C00", +"4 c #501400", +"5 c #501900", +"6 c #511900", +"7 c #6C1E00", +"8 c #642800", +"9 c #6A2500", +"0 c #742400", +"q c #7F3A00", +"w c #822700", +"e c #852300", +"r c #8D2900", +"t c #923001", +"y c #993700", +"u c #A23700", +"i c #A73D00", +"p c #A83700", +"a c #A93E00", +"s c #964203", +"d c #B84800", +"f c #BC4D00", +"g c #BF5500", +"h c #B76108", +"j c #CB3E00", +"k c #CF4200", +"l c #CE4600", +"z c #CC4F00", +"x c #C05900", +"c c #D04E00", +"v c #DB4600", +"b c #DB4700", +"n c #D84A00", +"m c #DD4C00", +"M c #DD5000", +"N c #C96500", +"B c #D16200", +"V c #D26600", +"C c #DD6D01", +"Z c #DD741C", +"A c #E04C00", +"S c #E44800", +"D c #E05100", +"F c #E35001", +"G c #E05A00", +"H c #E15B00", +"J c #E05C00", +"K c #E15C00", +"L c #E15D00", +"P c #E25E00", +"I c #E66100", +"U c #E66200", +"Y c #E76300", +"T c #E76400", +"R c #E86300", +"E c #E86400", +"W c #E96700", +"Q c #E47407", +"! c #EE7A00", +"~ c #ED7F00", +"^ c #F66400", +"/ c #F16900", +"( c #F56A00", +") c #F56C00", +"_ c #F76E00", +"` c #FB6600", +"' c #FD6B00", +"] c #F67200", +"[ c #F67300", +"{ c #F67400", +"} c #F67500", +"| c #F37F00", +" . c #F67900", +".. c #F77800", +"X. c #F67803", +"o. c #FB7500", +"O. c #F87900", +"+. c #F97900", +"@. c #FB7A00", +"#. c #FB7B00", +"$. c #FC7900", +"%. c #FE7A00", +"&. c #D88427", +"*. c #EE8604", +"=. c #F08100", +"-. c #F68E01", +";. c #F68B08", +":. c #FD8000", +">. c #FE8100", +",. c #FE8200", +"<. c #FE8400", +"1. c #FE8500", +"2. c #FE8800", +"3. c #FE8900", +"4. c #F89700", +"5. c #FC9900", +"6. c #FE9E00", +"7. c #F59A1A", +"8. c #FE9C13", +"9. c #E08528", +"0. c #E89827", +"q. c #F89F26", +"w. c #FEA800", +"e. c #FEAA02", +"r. c #FEAE03", +"t. c #FEAF02", +"y. c #FEAB08", +"u. c #FEA01D", +"i. c #FEB701", +"p. c #FEB602", +"a. c #FEB802", +"s. c #FCBB0C", +"d. c #FCA724", +"f. c #FCAB2A", +"g. c #FDAC2E", +"h. c #FEA830", +"j. c #F8AF39", +"k. c #FBB631", +"l. c #FEC308", +"z. c #FEC408", +"x. c #FEC809", +"c. c #FEC909", +"v. c #FEC416", +"b. c #FED311", +"n. c #FED611", +"m. c #FED711", +"M. c #FED818", +"N. c #FEDC1D", +"B. c #FEE619", +"V. c #FEE719", +"C. c #FEE61A", +"Z. c #FEE71B", +"A. c #FEED1A", +"S. c #FEF825", +"D. c #FEF827", +"F. c #FEF926", +"G. c #FEFC2D", +"H. c #FEFE2C", +"J. c #FEFE31", +"K. c #FEFE34", +"L. c #FEFE35", +"P. c #FEFE39", +"I. c #FEFE3D", +"U. c #FCCB4A", +"Y. c #FCD84D", +"T. c #FEE851", +"R. c #FEE85A", +"E. c #FEFD47", +"W. c #FEFE48", +"Q. c #FEFE49", +"!. c #FEFE50", +"~. c #FEFE52", +"^. c #FEED72", +"/. c #FEF763", +"(. c gray100", +"). c None", +/* pixels */ +").).).).).).).#.w ).).).).).).).", +").).).).).).} u.h X ).).).).).).", +").).).).).).} ^.k., ).).).).).).", +").).).).).( d.~.T.s ).).).).).).", +").:.#.o._ _ Y.J.~.&.p m k j ).).", +"3.8.h.f.k.U.W.H.L.R.j.0.9.Z F 2 ", +"=.7./.W.I.L.S.D.S.H.P.I.W.d.t # ", +").B *.M.A.B.B.Z.Z.B.B.N.;.w O ).", +").).g C s.n.b.b.b.n.v.Q 7 X ).).", +").).).f -.x.z.z.z.z.y.u X ).).).", +").).).R 4.i.t.t.p.i.e.d O ).).).", +").).).T 5.6.1./ X.6.e.H & ).).).", +").).M W :.' a > 0 c o.` - ).).).", +").).I ( z 3 O ).).< r S e ).).).", +").).M 8 # ).).).).).).1 - X ).).", +").).).).).).).).).).).).).).).)." +}; --- kdebase-3.5.6.orig/debian/icons/kmenuedit.xpm +++ kdebase-3.5.6/debian/icons/kmenuedit.xpm @@ -0,0 +1,293 @@ +/* XPM */ +static char *kmenuedit[] = { +/* columns rows colors chars-per-pixel */ +"32 32 255 2", +" c #000030", +". c #4D4D4D", +"X c #545453", +"o c #595651", +"O c #595855", +"+ c #5A5A59", +"@ c #686866", +"# c #6C6C6A", +"$ c #70706E", +"% c #737372", +"& c #787876", +"* c #7B7B79", +"= c #737FA4", +"- c #476EE5", +"; c #4C72EC", +": c #5478E7", +"> c #5178EA", +", c #627CC6", +"< c #7BA4FF", +"1 c #B83C00", +"2 c #B74000", +"3 c #B84000", +"4 c #A0684C", +"5 c #A67057", +"6 c #AF7558", +"7 c #BD7C58", +"8 c #A47C6B", +"9 c #C14B03", +"0 c #C04F10", +"q c #C45109", +"w c #DB6D15", +"e c #DE7117", +"r c #C06F3A", +"t c #CB763A", +"y c #D87226", +"u c #E27A23", +"i c #C77548", +"p c #D07941", +"a c #A18275", +"s c #B18F61", +"d c #B08B76", +"f c #B79D7C", +"g c #BE9177", +"h c #B8A179", +"j c #DDA739", +"k c #EC8E00", +"l c #E9961B", +"z c #F5891F", +"x c #E68732", +"c c #FB942B", +"v c #FF9C2F", +"b c #F89632", +"n c #FFA11F", +"m c #FFBC02", +"M c #FFB112", +"N c #FFB71F", +"B c #E8B236", +"V c #EEBC3B", +"C c #FFA126", +"Z c #FFA032", +"A c #FFAD34", +"S c #FFBF2F", +"D c #F1B631", +"F c #FFB934", +"G c #D3814A", +"H c #D68A59", +"J c #D88959", +"K c #C09F6A", +"L c #CDAB5E", +"P c #DBB268", +"I c #E18D50", +"U c #E99241", +"Y c #EDA052", +"T c #FDA646", +"R c #FFAA42", +"E c #FFB543", +"W c #FFB455", +"Q c #FEB25B", +"! c #FFBF56", +"~ c #E5A461", +"^ c #EEAB62", +"/ c #EBBD66", +"( c #FDBC6A", +") c #F6C700", +"_ c #FFC500", +"` c #FFC10F", +"' c #FFC908", +"] c #F4C61C", +"[ c #F4C916", +"{ c #FFC112", +"} c #FFC419", +"| c #FFCE17", +" . c #F8D001", +".. c #FFDD01", +"X. c #FFC621", +"o. c #FFC824", +"O. c #FFC92B", +"+. c #F4C431", +"@. c #F3C33E", +"#. c #FFCB35", +"$. c #FFCF3D", +"%. c #F7D029", +"&. c #FFD62A", +"*. c #FFDD20", +"=. c #FFDB3F", +"-. c #FFE106", +";. c #FEEC01", +":. c #FFE41C", +">. c #FDE919", +",. c #FFF001", +"<. c #FFF00D", +"1. c #FEEA31", +"2. c #FFF428", +"3. c #FFC741", +"4. c #F1C456", +"5. c #FFCE53", +"6. c #FFD144", +"7. c #FFD349", +"8. c #FFD553", +"9. c #FFD85B", +"0. c #FFC166", +"q. c #FFC964", +"w. c #FEC379", +"e. c #FFC877", +"r. c #FFD563", +"t. c #FAD56B", +"y. c #FFD962", +"u. c #FFDD6C", +"i. c #FFD174", +"p. c #FFDC75", +"a. c #FDE845", +"s. c #FFEC4B", +"d. c #FDE255", +"f. c #FFF642", +"g. c #FFF65C", +"h. c #FDE569", +"j. c #FFE17B", +"k. c #FFF365", +"l. c #FFF57D", +"z. c #FFF976", +"x. c #8E8C84", +"c. c #8A8B8C", +"v. c #938E8F", +"b. c #9E8C84", +"n. c #988E91", +"m. c #92908E", +"M. c #9B968E", +"N. c #949494", +"B. c #9A9792", +"V. c #9A9994", +"C. c #9B9A9C", +"Z. c #8493A7", +"A. c #8492A8", +"S. c #8D99A9", +"D. c #9D9EA2", +"F. c #A19E99", +"G. c #A0A09E", +"H. c #BCA298", +"J. c #A4A3A1", +"K. c #A8A8A6", +"L. c #ACABAA", +"P. c #ABABB0", +"I. c #B1B1AF", +"U. c #B2B1B3", +"Y. c #BAB5B7", +"T. c #BCBBBC", +"R. c #849ED9", +"E. c #8AAAD7", +"W. c #93B0DA", +"Q. c #9DB1D4", +"!. c #84ABFF", +"~. c #86B8FF", +"^. c #8CB7FF", +"/. c #8CBBFF", +"(. c #AAB5C4", +"). c #AFB9C6", +"_. c #B3BEC6", +"`. c #BCBCC0", +"'. c #8DC0FF", +"]. c #93C1FF", +"[. c #9AC5FF", +"{. c #9CC9FF", +"}. c #B9C1C5", +"|. c #A9CFFF", +" X c #ACD6FF", +".X c #B6C8E1", +"XX c #BBCBE3", +"oX c #BFD0E3", +"OX c #C3A680", +"+X c #CEB29D", +"@X c #D1A48A", +"#X c #D9BB8C", +"$X c #D9B190", +"%X c #D8BD96", +"&X c #C5B7B9", +"*X c #C0C0BE", +"=X c #D5C8B3", +"-X c #F3CA81", +";X c #F7CC8B", +":X c #FFCC81", +">X c #F6CF9D", +",X c #FFD58C", +".L /./././././.'.Z.DXaXpXaXaXaXaXsX*XX ", +"IXIXIXIXIXIX3 u R S O.&.2.] Q.^.^.^.^.^./.Z.DXaXpXpXtXpXpXdXT.X ", +"IXIXIXIXIXIXIXq T E #.#.1.1.s ; ; ; ; ; ; = fXm.V.V.V.V.V.V.m.+ ", +"IXIXIXIXIXIXIX3 x W 3.$.=.f.+.dXjXjXjXjXkXC.CX.XXXXXXXXXXXoX).X ", +"IXIXIXIXIXIXIXIXr Q 4.7.7.s.a./ cXcXfXfXcXF.zX].[.[.[.[.[.{.W.o ", +"IXIXIXIXIXIXIXIXd x 0.5.8.9.g.@.=XiXuXaXdXV.lX~./.'./.'./.'.E.o ", +" IXIXIXIXIXIXIXL.G 0.q.8.9.k.d.P wXwXwXrXV.kX< !.!.!.!.!.!.R.o ", +" IXIXIXIXIXU.g Y e.y.y.h.z.V M.N.N.V.x.gX- : : : : : : , O ", +" IXIXIXL.KXp :Xi.u.h.l.h.-XSXDXSXD.JXSXSXSXJXSXSXSXaXX ", +" IXL.SX@X^ ,Xp.p.j.9X4.iXaXfXV.AXfXdXfXfXfXdXhXwXX ", +" J.ZXeXI ,XXK U.Y.c.ZXT.T.}.*X*X*XeXU.X ", +" J.P.N.v.t 3XMXnXHX>Xf J.J.V.$ @ @ % % % % $ % O ", +" C.CXCXCX&XJ nXGXFX2X4XKXKXKXN.V.c.. . . . . . . ", +"IX C.sXT.`.eXU.i vXHX$X+XaXaXaXfXVXeXX IXIXIXIXIXIX", +"IXIXIX C.sX`.`.`.wXY.7 H.a +XaXaXaXaXdXwXO . IXIXIXIXIX", +"IXIXIXIXIXIX D.T.N.C.C.N.C.C.4 6 b.K.K.K.K.L.J.+ . IXIXIXIXIX", +"IXIXIXIXIXIXIXIXL.tXL.L.P.P.L.P.I.5 m.*X*X&XT.T.K.+ . IXIXIXIXIX", +"IXIXIXIXIXIXIXIXK.PXJXKXSXJXJXJXJXJXJXJXJXJXSXKXaXX . IXIXIXIXIX", +"IXIXIXIXIXIXIXIXL.JXpXpXyXyXpXaXpXpXpXpXpXpXtXdXwXX . IXIXIXIXIX", +"IXIXIXIXIXIXIXIXP.JXuXpXaXyXyXyXpXpXaXpXaXtXaXdX*X+ . IXIXIXIXIX", +"IXIXIXIXIXIXIXIXG.Y.G.J.J.J.J.J.J.J.J.J.J.J.J.J.C.+ . IXIXIXIXIX", +"IXIXIXIXIXIXIXIX$ X + + + + + + + + + O + + + + + X . IXIXIXIXIX", +"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX" +}; --- kdebase-3.5.6.orig/debian/icons/khelpcenter.xpm +++ kdebase-3.5.6/debian/icons/khelpcenter.xpm @@ -0,0 +1,234 @@ +/* XPM */ +static char *khelpcenter[] = { +/* columns rows colors chars-per-pixel */ +"32 32 196 2", +" c black", +". c #6A0B00", +"X c #730E00", +"o c #7C0E00", +"O c #7B1200", +"+ c #800E00", +"@ c #851300", +"# c #8A1900", +"$ c #911D00", +"% c #9F2300", +"& c #A60D01", +"* c #A71003", +"= c #B91508", +"- c #B91D00", +"; c #AD2700", +": c #AB2900", +"> c #A1331F", +", c #B22B00", +"< c #BA2C00", +"1 c #B63100", +"2 c #BE3600", +"3 c #BE360F", +"4 c #B75F4E", +"5 c #B76A5E", +"6 c #C90C05", +"7 c #C01D00", +"8 c #CA1109", +"9 c #CC1B16", +"0 c #D1110B", +"q c #DD1E00", +"w c #D01E1C", +"e c #D91B17", +"r c #C1370E", +"t c #C63A00", +"y c #CA3400", +"u c #C93800", +"i c #CD3E0E", +"p c #DF2F00", +"a c #DD201C", +"s c #D23A00", +"d c #DD3E00", +"f c #D92121", +"g c #DB2D2D", +"h c #D63527", +"j c #D53939", +"k c #DB3737", +"l c #EB1A1A", +"z c #FB0606", +"x c #F90C05", +"c c #F31111", +"v c #F31A1A", +"b c #FA1010", +"n c #FA1A1A", +"m c #E22B01", +"M c #EB3600", +"N c #F32005", +"B c #F8240B", +"V c #FC2909", +"C c #F13600", +"Z c #F63C0B", +"A c #E42424", +"S c #E12D2D", +"D c #ED2423", +"F c #EB2D2C", +"G c #E33737", +"H c #EA3737", +"J c #F32424", +"K c #F42D2D", +"L c #FB2424", +"P c #FC2B2B", +"I c #F43636", +"U c #FB3737", +"Y c #FF3D34", +"T c #C1431F", +"R c #D74507", +"E c #D94A0E", +"W c #DD5D27", +"Q c #D76434", +"! c #DD6D3E", +"~ c #EA4500", +"^ c #E24B1C", +"/ c #FF4009", +"( c #FF4A12", +") c #F75C1A", +"_ c #FD5919", +"` c #E24A20", +"' c #EE4432", +"] c #EE4638", +"[ c #F34C31", +"{ c #FC5333", +"} c #FF5A31", +"| c #EC6A34", +" . c #F06124", +".. c #F0682D", +"X. c #F96527", +"o. c #F86139", +"O. c #FC6A3C", +"+. c #C56245", +"@. c #CA684E", +"#. c #D86B46", +"$. c #D37046", +"%. c #D7784F", +"&. c #D77E58", +"*. c #DB7C5E", +"=. c #E34141", +"-. c #E54A4A", +";. c #EC4141", +":. c #EA4C4A", +">. c #E45454", +",. c #E15E5E", +"<. c #EB5251", +"1. c #F54141", +"2. c #F34A4A", +"3. c #FB4141", +"4. c #F94A4A", +"5. c #F15454", +"6. c #F05855", +"7. c #F85454", +"8. c #F8664D", +"9. c #F86F47", +"0. c #F07541", +"q. c #FB7943", +"w. c #F67E57", +"e. c #E26E6E", +"r. c #EC6361", +"t. c #ED7373", +"y. c #FD6D6D", +"u. c #F1766D", +"i. c #F27979", +"p. c #FF7B75", +"a. c #CD8B7D", +"s. c #D78460", +"d. c #D58A6B", +"f. c #D28E7D", +"g. c #F68251", +"h. c #FF8B5A", +"j. c #FF8673", +"k. c #FF8578", +"l. c #FF887C", +"z. c #F69A74", +"x. c #FE9E76", +"c. c #CC9D88", +"v. c #DD9F85", +"b. c #D9A38B", +"n. c #D6B2A8", +"m. c #EA9A87", +"M. c #ED9494", +"N. c #F38F8F", +"B. c #FA8484", +"V. c #FF8983", +"C. c #FF9489", +"Z. c #FF9983", +"A. c #F79797", +"S. c #ECA586", +"D. c #ECB299", +"F. c #FEA884", +"G. c #F7B497", +"H. c #F3B89E", +"J. c #FFB798", +"K. c #E6ADAD", +"L. c #EBACAC", +"P. c #E3BBAD", +"I. c #F6A3A3", +"U. c #FDA2A2", +"Y. c #FCAAAA", +"T. c #F3BBBB", +"R. c #FCB4B4", +"E. c #FDBEBE", +"W. c #FEC1A7", +"Q. c #FDC3AB", +"!. c #FDC7B0", +"~. c #FDCAB5", +"^. c #FECEBA", +"/. c #FED0BC", +"(. c #E6CECA", +"). c #EFCFC2", +"_. c #F4C5C5", +"`. c #F4CBCB", +"'. c #FCC3C3", +"]. c #FECACA", +"[. c #F1D5CD", +"{. c #F4D4D4", +"}. c #F4DADA", +"|. c #FDD6D6", +" X c #F7E3DD", +".X c #FCE1D6", +"XX c #E4E4E4", +"oX c #ECECEC", +"OX c #F1E4E4", +"+X c #FCE3E3", +"@X c #FAEEEC", +"#X c #FDF1EE", +"$X c #F4F4F4", +"%X c #FDF4F4", +"&X c #FDFDFD", +"*X c None", +/* pixels */ +"*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X", +"*X*X*X*X*X*X*X*X*X*X*X*X*Xd.d.s.&.%.$.*X*X*X*X*X*X*X*X*X*X*X*X*X", +"*X*X*X*X*X*X*X*X*X*Xv.S.J.W.^.~.!.Q.F.O.| W *X*X*X*X*X*X*X*X*X*X", +"*X*X*X*X*X*X*X*Xb.G./.@X&X&X&X&X&X&X#XY.l.} ) E *X*X*X*X*X*X*X*X", +"*X*X*X*X*X*Xc.D.Z.#X&X&X&X&X&X&X&X&X+X].].].V.( ~ t *X*X*X*X*X*X", +"*X*X*X*X*Xc.H.l.'.+X&X&X&X&X$X&X&X&X|.].].].].'.{ ~ 2 *X*X*X*X*X", +"*X*X*X*Xc.H.C.].].].$X&X&X$X&X&X&X$X].].].].].].].8.M 1 *X*X*X*X", +"*X*X*X*XD.k.].].'.].|.&X&X$X$XoXoXT.I.].].].].].].].[ u *X*X*X*X", +"*X*X*Xb.Z.R.E.E.E.E.E.}.).z.q... ._ Z ' N.T.E.E.~.E.R.` , *X*X*X", +"*X*X*XG.V.R.R.R.R.R.6.9.0.Q *X*X*X*XR ~ C <.T.R.R.].%X}.y *X*X*X", +"*X*Xb.j.Y.Y.Y.Y.Y.<.9.! *X*X*X*X*X*X*X*Xs M :.T.+X$X&X&X*.: *X*X", +"*X*XS.p.U.U.U.A.i.} ! *X*X*X*X*X*X*X*X*X*Xu ^ $X$X&X&X&X[., *X*X", +"*X*XJ.&X+X'.Y.A.] 0.*X*X*X*X*X*X*X*X*X*X*X*Xs P.$X$X$X&X&XT *X*X", +"*Xd.H.&X&X&X$XOXg.Q *X*X*X*X*X*X*X*X*X*X*X*X, #.oX$X&X$X&X@.$ *X", +"*Xd.^.&X&X&X$XoXq.*X*X*X*X*X*X*X*X*X*X*X*X*X*XR oX$X$X&X&Xf.$ *X", +"*Xs.~.&X$X$X$XoX| *X*X*X*X*X*X*X*X*X*X*X*X*X*X< XX$X$X&X&Xf.# *X", +"*X&.Q.&X&X$X$XoX .*X*X*X*X*X*X*X*X*X*X*X*X*X*X< XX$X$X&X&Xa.# *X", +"*X%.Q.$X$X&XoXoXX.*X*X*X*X*X*X*X*X*X*X*X*X*X*X3 oXoX$X$X$Xa.@ *X", +"*X$.F.&X&X$X$XoXg.R *X*X*X*X*X*X*X*X*X*X*X*X% - ,.M._.@X&X4 O *X", +"*X*Xh.&X&X$X$XoXm.~ *X*X*X*X*X*X*X*X*X*X*X*X; 9 >.<.5.7.y.> *X*X", +"*X*X| .X&X$X{.t.H M s *X*X*X*X*X*X*X*X*X*X% - k -.:.2.4.F @ *X*X", +"*X*XW x.#XB.1.;.;.a M u *X*X*X*X*X*X*X*X% - w =.;.;.1.3.= O *X*X", +"*X*X*X) Y U U I H G e p s , *X*X*X*X: : - 9 k G H H U D @ *X*X*X", +"*X*X*XE / P K K F F S f h #.i < < 3 +.n.j g S F K K P * X *X*X*X", +"*X*X*X*X~ V L L J D A A e.XXXXXXXXXXXXoXK.A A D J L 8 o *X*X*X*X", +"*X*X*X*Xt ~ B n n v l l L.oXoXoXXXoXoXoXoX<.l v v 0 + . *X*X*X*X", +"*X*X*X*X*Xt d N b b c c OX$XoXoXoXoX$XoX$X`.c b 6 + . *X*X*X*X*X", +"*X*X*X*X*X*X1 y m x z I $X$X$X$X$X$X$X$X$X%Xr.& o . *X*X*X*X*X*X", +"*X*X*X*X*X*X*X*X, y q u.&X$X$X&X$X$X&X$X(.5 @ X *X*X*X*X*X*X*X*X", +"*X*X*X*X*X*X*X*X*X*X: , T @.f.f.a.a.5 > @ O *X*X*X*X*X*X*X*X*X*X", +"*X*X*X*X*X*X*X*X*X*X*X*X*X$ $ # # @ o *X*X*X*X*X*X*X*X*X*X*X*X*X", +"*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X" +}; --- kdebase-3.5.6.orig/debian/icons/ksysguard.xpm +++ kdebase-3.5.6/debian/icons/ksysguard.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *ksysguard[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #010101", +". c #090909", +"X c #081022", +"o c #051127", +"O c #2C3238", +"+ c #3B3833", +"@ c #132D64", +"# c #153167", +"$ c #3B434C", +"% c #49443C", +"& c #524A3E", +"* c #514F4A", +"= c #56534E", +"- c #5C5751", +"; c #545B66", +": c #515D74", +"> c #625B52", +", c #68635A", +"< c #646360", +"1 c #6C6965", +"2 c #74716B", +"3 c #78756D", +"4 c #787876", +"5 c #194090", +"6 c #1F4CA4", +"7 c #254E9E", +"8 c #2B53A5", +"9 c #2B56AB", +"0 c #2D5DBD", +"q c #3359A6", +"w c #3258A9", +"e c #315EBC", +"r c #3D63B0", +"t c #2F61CC", +"y c #2E64D5", +"u c #3264CD", +"i c #3A6ACE", +"p c #3766C3", +"a c #3369DA", +"s c #3066DB", +"d c #3B70DF", +"f c #3F78DE", +"g c #3B75E0", +"h c #5C7293", +"j c #5B749B", +"k c #5A76A4", +"l c #657895", +"z c #647999", +"x c #406ECF", +"c c #406ED0", +"v c #4372D3", +"b c #4B76D1", +"n c #4B79D3", +"m c #4979DE", +"M c #527BD3", +"N c #587CC6", +"B c #507EE2", +"V c #78859A", +"C c #6287BD", +"Z c #668ABE", +"A c #7085A4", +"S c #778EB3", +"D c #7B91B5", +"F c #6B84A9", +"G c #548BDE", +"H c #5D88D4", +"J c #598EDF", +"K c #5B84D8", +"L c #4C8BE9", +"P c #4B8DF0", +"I c #4E90F2", +"U c #518FEE", +"Y c #5886E8", +"T c #5C8BE4", +"R c #5586E4", +"E c #508FF1", +"W c #5591EB", +"Q c #5E90E7", +"! c #5A94ED", +"~ c #5E98EB", +"^ c #5292F1", +"/ c #5897F4", +"( c #648DC6", +") c #6288CB", +"_ c #6186D7", +"` c #658AD8", +"' c #6A8DD9", +"] c #6892CF", +"[ c #6A94D9", +"{ c #7798CA", +"} c #7094D1", +"| c #7293DA", +" . c #789ED6", +".. c #789DDD", +"X. c #628AE3", +"o. c #688FE4", +"O. c #649BEE", +"+. c #6993E4", +"@. c #6C9BE0", +"#. c #6E9DEC", +"$. c #609AF2", +"%. c #7196E6", +"&. c #7299E4", +"*. c #7B9DE5", +"=. c #7C9DE8", +"-. c #7B9DF2", +";. c #6BA0ED", +":. c #69A0F0", +">. c #72A3ED", +",. c #7BA3EA", +"<. c #79A9EE", +"1. c #71A4F1", +"2. c #76A8F2", +"3. c #7AAAF2", +"4. c #85827C", +"5. c #838483", +"6. c #86888D", +"7. c #8B8B8C", +"8. c #8A8784", +"9. c #888C95", +"0. c #96928C", +"q. c #979898", +"w. c #9A9894", +"e. c #9D9C9C", +"r. c #9B9790", +"t. c #8D9CAF", +"y. c #8A97AC", +"u. c #8398BA", +"i. c #909DB5", +"p. c #96A1B3", +"a. c #95A3B8", +"s. c #98A4B7", +"d. c #A09E9D", +"f. c #A19C95", +"g. c #A6A29C", +"h. c #ABA69E", +"j. c #ADA89F", +"k. c #A3A2A1", +"l. c #A8A5A0", +"z. c #A9A8A7", +"x. c #B2ACA4", +"c. c #B5B3AF", +"v. c #BBB8AF", +"b. c #B4B4B4", +"n. c #BCBCBC", +"m. c #B8B7B4", +"M. c #859EC4", +"N. c #819DCA", +"B. c #8B9FC4", +"V. c #81A0CC", +"C. c #94A5C5", +"Z. c #97AACD", +"A. c #93ADD6", +"S. c #9DAFD2", +"D. c #9BB1D6", +"F. c #83A5E9", +"G. c #84AAEA", +"H. c #8BACEB", +"J. c #88A7E7", +"K. c #81ADF0", +"L. c #84A2F0", +"P. c #8AB0EE", +"I. c #82B0F5", +"U. c #83B3FD", +"Y. c #8AB2F2", +"T. c #8CB8FC", +"R. c #8CB7FA", +"E. c #92ADEB", +"W. c #92AFE1", +"Q. c #93B2E4", +"!. c #94B2EB", +"~. c #9BB5EC", +"^. c #9CB9EC", +"/. c #9BB7E3", +"(. c #91B6F1", +"). c #93BAF3", +"_. c #93BBF8", +"`. c #9ABCF2", +"'. c #A5B9DF", +"]. c #B3BDD3", +"[. c #AAB4C6", +"{. c #A5BDE1", +"}. c #A4BCED", +"|. c #A9BDED", +" X c #A2BCF1", +".X c #A8BFF5", +"XX c #9CC0F4", +"oX c #9BC1FB", +"OX c #95C1FF", +"+X c #AFC2DF", +"@X c #B8C1D8", +"#X c #ADC1EC", +"$X c #A4C4F4", +"%X c #A2C4F8", +"&X c #A5C9FD", +"*X c #AAC5F2", +"=X c #ADC8F4", +"-X c #A9C9FA", +";X c #B1C6F2", +":X c #B3C8F3", +">X c #B2CFFB", +",X c #BACCF3", +"X1X1X1X1X>XaXFX|.IXLXn.IXIX|.DXaX>X3X1X1X1X:X;X#X;Xq . ", +"_ }.}.$X=X=X=X=X:X-XrXDXIXIXIXPXIXIXIXDXrX-X=X=X=X=X*X$X}.|.q . ", +"H ~.^.}.$X$X$X$X*X-X8XpXIXPXPXPXPXIXIXuX8X%X$X$X$X$XXXXX/.^.q . ", +"x *.~.`.`.%X%X).3.#.S w.nXPXLXLXLXPXGX9X].XXXXXXXXXX^.).!.H.8 . ", +"t y f L W { { ] L L U 7.w.iXIXIXIXiXq.7.<.).).'.+X#XP.P.J.J.q . ", +"t a f H n.wXaXwXn.[ I J 6.r.w.z.w.0.6.G P ..yXVXZXaXyXW.,.*.8 . ", +"t a n 6XpXIX*.IXqXn.Q L U C V V V C I ^ J 4XyXIX~.IXeXeX..%.8 . ", +"t a i.eX3 m.IXIXIX9Xs.I W ^ ^ ^ ^ ^ ! L s.8XIXPXIX4.CXaX[.X.8 . ", +"t a x.].,X5.b.PX#X].x.^ ! ! ! ! ! ! ! ^ x.].|.PXk.uXgX0X4XY 8 . ", +"u d x.CXIXIXIXPXIXZXj.! ~ ~ ~ ~ ~ ~ ~ / j.CXIXPXIXPXIXAXv.Y 8 . ", +"u m y.].IXLXLXPXIXn.i.~ O.O.O.O.$.O.O.$.t.n.IXLXLXLXIX5Xp.R 8 . ", +"i M ) g.7XIXIXIX7Xg.@.:.;.:.:.:.:.:.;.:...g.7XIXIXIX7Xg.H B 8 . ", +"i R Q } e.z.c.g.d. .1.>.2.[ ( ( ( ;.1.>.:. .d.j.b.h.g.} Q M 7 . ", +"x X.@.;.1.{ C. .2.2.3.3.3.h 4.w., Z 3.3.3.2.2.V.V.{ ;.#.+.T 8 . ", +"v ' &.<.3.3.T.3.I.3.K.K.I.h l.7X1 k I.3.P.3.3.U.U.U.3.,.%.o.8 . ", +"b &.,.K.D , 4 ; T.Y.Y.Y.T.l 8.z.= j R.Y.Y.P.T.& 3 % R.,.=.%.8 . ", +"b *.F.H.{ w.yX$ R.(.(.(._.l 5.w.* j _.(.(.(.OX2 yX= G.H.F.=.8 . ", +"b J.H.).{ 2 d.O XX`.`.`.oXl g.8X, j oX`.XX`.oX- d.+ H.P.H.,.8 . ", +"M E.E.`.N.5.5XO XXXXXXXXXXM.8XFXV F $XXXXXXX&X, n.% W.`.!.H.8 . ", +"M E.`..XA.b.UX$ -X$X*X-X-X-Xp.5.- D -X*X*X-X&X7.JX< /.XX!.!.8 . ", +"M ~.D.C.-Xs.7.: #X-X*X-X*X-X/.A A Z.*X*X-X*X-XS.6.; /.^. X~.8 . ", +"b |.q.r.C.|.D B.=X=X=X#X#X=X=X=X*X*X;X=X=X=X#X*XM.D Z.h.6.~.7 . ", +"e E.9.l '.:X;X:X:X*X;X c #717189", +", c #9A560F", +"< c #9C550E", +"1 c #935117", +"2 c #9F5615", +"3 c #995912", +"4 c #9A5810", +"5 c #995C12", +"6 c #9A5E13", +"7 c #9C681E", +"8 c #9F7331", +"9 c #AD5C09", +"0 c #AD5E0A", +"q c #B15D08", +"w c #AC600B", +"e c #AC610B", +"r c #AC630C", +"t c #AC650D", +"y c #AC660E", +"u c #AE6A0F", +"i c #A26715", +"p c #A06419", +"a c #AC6613", +"s c #AC6915", +"d c #AC6B16", +"f c #AE6F17", +"g c #AC7016", +"h c #AC7019", +"j c #AD761C", +"k c #B57A18", +"l c #A86A20", +"z c #A7793C", +"x c #B6821E", +"c c #B8892A", +"v c #AD8040", +"b c #C28F1F", +"n c #C18326", +"m c #CC872B", +"M c #CE8822", +"N c #CC8928", +"B c #C09022", +"V c #CA9D25", +"C c #D98633", +"Z c #DA8C37", +"A c #D5912A", +"S c #D39E38", +"D c #DD9139", +"F c #DF983C", +"G c #D6AC29", +"H c #FB8B10", +"J c #EB943B", +"K c #FDB125", +"L c #C2BE68", +"P c #E19E40", +"I c #ED9A41", +"U c #EE9E43", +"Y c #E3A442", +"T c #E5AA46", +"R c #E7AF49", +"E c #EFA145", +"W c #E7AE51", +"Q c #E2B052", +"! c #E4B354", +"~ c #E8B153", +"^ c #E9BC58", +"/ c #F1A647", +"( c #F2AA49", +") c #F4AE4B", +"_ c #F4B14E", +"` c #F6B44E", +"' c #CDC766", +"] c #E7C154", +"[ c #EBC75E", +"{ c #EDD163", +"} c #EFDB69", +"| c #F2E75F", +" . c #FFF752", +".. c #FFF45A", +"X. c #F0E470", +"o. c #FAF971", +"O. c #858597", +"+. c #949499", +"@. c #98989C", +"#. c #9191A5", +"$. c #9394AD", +"%. c #9595AA", +"&. c #9C9CA0", +"*. c #9D9DA2", +"=. c #9B9BB1", +"-. c #9C9DB3", +";. c #9E9EB3", +":. c #A7A7AA", +">. c #AAAAAA", +",. c #ACACAE", +"<. c #A0A0B4", +"1. c #A2A2B5", +"2. c #A4A4B7", +"3. c #A6A7BC", +"4. c #AFAFB0", +"5. c #A8A8BA", +"6. c #A9A9BC", +"7. c #B2B2B8", +"8. c #B6B9BE", +"9. c #B8B8BD", +"0. c #BDBDC1", +"q. c #BFBFC3", +"w. c #C1C2C7", +"e. c #C5C5C7", +"r. c #C1C1CA", +"t. c #C2C2CE", +"y. c #C6C6C9", +"u. c #CBCBCB", +"i. c #CCCCCF", +"p. c #CECECD", +"a. c gray81", +"s. c #C5C5D2", +"d. c #C6C6D3", +"f. c #CED0CF", +"g. c #D3D3DB", +"h. c #D3D3DC", +"j. c #D5D5D8", +"k. c #D5D5DD", +"l. c #DDDDDF", +"z. c #CBCDE4", +"x. c #CECEE0", +"c. c #CDCFE4", +"v. c #D1D1E3", +"b. c #D2D2E4", +"n. c #D2D3E4", +"m. c #D3D4E4", +"M. c #D5D5E6", +"N. c #D8D8E2", +"B. c #DBDBE3", +"V. c #DCDCE4", +"C. c #D8DAEA", +"Z. c #E5E6EB", +"A. c #E6E7E8", +"S. c #E5E5EF", +"D. c #EAEAEB", +"F. c #E4E4F1", +"G. c #E4E5F2", +"H. c #E4E5F3", +"J. c #E6E7F3", +"K. c #E7E8F3", +"L. c #E5E9F6", +"P. c #EAEAF1", +"I. c #E9EBF7", +"U. c #EBEBF4", +"Y. c #EAECF5", +"T. c #EBECF7", +"R. c #EBEDF6", +"E. c #ECECF2", +"W. c #ECECF3", +"Q. c #ECECF4", +"!. c #ECEDF6", +"~. c #EEEFF7", +"^. c #E8EBF9", +"/. c #EAEDF8", +"(. c #EFEFF9", +"). c #F0F1F8", +"_. c #F1F2F8", +"`. c #F1F3FB", +"'. c #F1F3FC", +"]. c #F2F3FC", +"[. c #F3F3FC", +"{. c #F1F4FB", +"}. c #F3F5FC", +"|. c #F3F5FD", +" X c #F5F5F9", +".X c #F5F7FF", +"XX c #F6F6FC", +"oX c #FCFCFF", +"OX c #FEFFFF", +"+X c gray100", +"@X c None", +/* pixels */ +"@X@X@X@X> -.s.t.s.#.% @X@X@X@X@X", +"@Xm A v %.E.+X+X+XP.O.8 n * @X@X", +"@XS ..L 3.B.g.h.h.V.2.' .c @X", +"@XG o.f.=.5.6.1.1.-.$.8.| b $ @X", +"@XV X.[.+XD.l. X~.F.F.c.^ k ", +"@XB } ).+Xu.>.+X XU.F.x.R g ", +"@Xx { ).+Xa.,.+X0.r.H.b.T i ", +"@Xj [ ~.+Xa.,.0.+.N.L.b.Y 6 ", +"@Xg ^ T.+Xi.; : h.).K.b.J 7 ", +"@Xd ~ T.+Xy.@.8.*.~.T.M.F 5 ", +"@Xa W {.+Xe.:.oX&.7.).M.D 4 # ", +"@Xs ! [.+XA.j.+XZ.r.[.C.Z 4 ", +"@Xh Q ^.[..X[.~./.I.L.z.C < # ", +"@Xh K _ _ ) ( E E U I J H 1 # ", +"@X- 7 t a t r r w 9 9 q 2 = ", +"@X # # # # # # # # # " +}; --- kdebase-3.5.6.orig/debian/icons/kicker.xpm +++ kdebase-3.5.6/debian/icons/kicker.xpm @@ -0,0 +1,206 @@ +/* XPM */ +static char *kicker[] = { +/* columns rows colors chars-per-pixel */ +"16 16 184 2", +" c #5C5C5D", +". c #5E5F5F", +"X c #606060", +"o c #606161", +"O c #616161", +"+ c #616261", +"@ c #616262", +"# c #666766", +"$ c #6C6D6D", +"% c #777991", +"& c #D2AA38", +"* c #F7AF0E", +"= c #D8B959", +"- c #C1AC76", +"; c #CCB57D", +": c #DBB96B", +"> c #EBAD44", +", c #F6AD49", +"< c #E9B062", +"1 c #F5C802", +"2 c #E5C52C", +"3 c #E6CA3E", +"4 c #DAD47C", +"5 c #E3CA59", +"6 c #E3CF6F", +"7 c #8A8A8A", +"8 c #8B8B8B", +"9 c #8C8D8C", +"0 c #8C8F96", +"q c #8A889A", +"w c #9F9683", +"e c #929292", +"r c #929393", +"t c #939393", +"y c #979797", +"u c #91959F", +"i c #979898", +"p c #99949C", +"a c #9C9897", +"s c #9293A5", +"d c #979BA0", +"f c #9897A4", +"g c #9998AA", +"h c #9898AC", +"j c #989CA8", +"k c #9CA0A2", +"l c #9DA0A6", +"z c #9EA2A7", +"x c #BEB197", +"c c #A1A4AA", +"v c #A3A5AC", +"b c #A6A9AD", +"n c #A7AAAF", +"m c #ACAEB8", +"M c #AEAFBD", +"N c #ACB1B0", +"B c #AEB2B1", +"V c #AFB3B3", +"C c #B0B3B6", +"Z c #B0B5B3", +"A c #B1B5B4", +"S c #B1B4B6", +"D c #B1B7B4", +"F c #B2B6B6", +"G c #B2B7B6", +"H c #B0B1B8", +"J c #B1B6BC", +"K c #B4B8B6", +"L c #B5BABF", +"P c #B7B8BC", +"I c #B7BCBC", +"U c #B2B3C0", +"Y c #B6B7C6", +"T c #BABEC0", +"R c #BABEC1", +"E c #BBBFC2", +"W c #B8BCC7", +"Q c #BCBFC0", +"! c #BAB9C8", +"~ c #BCC2C2", +"^ c #BDC2C6", +"/ c #BFC1C6", +"( c #C1B18F", +") c #C5C1BE", +"_ c #CEC6B8", +"` c #D8C2AB", +"' c #D5C5B2", +"] c #D9CEBC", +"[ c #E1D081", +"{ c #E8DB94", +"} c #F5C181", +"| c #C0C4C4", +" . c #C1C7C7", +".. c #C0C5CA", +"X. c #C0C5CB", +"o. c #C2C4CB", +"O. c #C3C6CD", +"+. c #C4C7CE", +"@. c #CACDC1", +"#. c #C7CBD4", +"$. c #CCCDD1", +"%. c #CCCFD4", +"&. c #CDD1D3", +"*. c #CED4D3", +"=. c #CED3DA", +"-. c #D1D7D6", +";. c #D1D7D7", +":. c #D7D3D6", +">. c #D5D4D2", +",. c #D5D3D9", +"<. c #D0D8D7", +"1. c #D1D8D6", +"2. c #D2D8D7", +"3. c #D3D8D7", +"4. c #D3D9D7", +"5. c #D2D8D8", +"6. c #D3D9D8", +"7. c #D4DAD8", +"8. c #D4DAD9", +"9. c #D4DBD9", +"0. c #D5DADA", +"q. c #D5DBDA", +"w. c #D6DCDB", +"e. c #D7DDDB", +"r. c #D7DDDC", +"t. c #D8DEDC", +"y. c #D9DEDD", +"u. c #D9DFDE", +"i. c #DFDFDF", +"p. c #DCDCE4", +"a. c #DBE1DF", +"s. c #DAE2E0", +"d. c #DEE4E3", +"f. c #DFE4E3", +"g. c #E8DBCB", +"h. c #EEDECA", +"j. c #E0DED6", +"k. c #EEE4C9", +"l. c #E0E0E2", +"z. c #E3E3E3", +"x. c #E0E1E5", +"c. c #E2E3E7", +"v. c #E2E5E5", +"b. c #E3E5E6", +"n. c #E4E7E7", +"m. c #E5E6E7", +"M. c #E6E6E7", +"N. c #E7E8E9", +"B. c #E6E9EB", +"V. c #E6EAE9", +"C. c #E7EAEA", +"Z. c #E7EBEA", +"A. c #E7EBEB", +"S. c #E9E7E5", +"D. c #E8E8EB", +"F. c #EBEBEB", +"G. c #E9EBEC", +"H. c #EAEAED", +"J. c #EAEBED", +"K. c #E9ECEB", +"L. c #E9EDEC", +"P. c #E9EDED", +"I. c #EAEDEC", +"U. c #EAEEED", +"Y. c #EAEFED", +"T. c #EBEFED", +"R. c #ECECEC", +"E. c #EDEFEF", +"W. c #EEEEEE", +"Q. c #EEEEF0", +"!. c #EFF0F4", +"~. c #F0F0F0", +"^. c #F1F1F1", +"/. c #F1F3F2", +"(. c #F3F3F3", +"). c #F6F7F7", +"_. c #F2F4F9", +"`. c #F4F4F9", +"'. c #FAFBFB", +"]. c #FBFBFB", +"[. c #FBFCFB", +"{. c #FCFCFC", +"}. c #FCFDFD", +"|. c #FDFDFD", +/* pixels */ +"|.^.^.^.^.^.^.^.^.~.^.^.^.^.^.|.", +"z.i r r t t r r r r r r r r y /.", +"9 /.I.I.Y.Y.E.I.v.K.K.z.v.K.I.|.", +"7 I.6.6.%.5.B.l.Q &.E.$.V ;.s.'.", +"7 I.6.%.+...N.M...x.I.V / r.a.'.", +"7 I.5.O.,.' g.!.x.D.P I r.r.w.'.", +"7 K.;...` } h._.`.p.v .e.w.r.'.", +"7 N.=.>.< , k.S.] :.Y m T 6.s.'.", +"8 z.W ) > * { a.= ; ! g j 5.v.'.", +"8 N.^ C : 1 4 _ 2 & p % i w.f.'.", +"7 I.w.#._ 5 6 [ 3 - q s T w.a.'.", +"7 I.-...M a x ( w f s b 5.r.r.'.", +"7 I.6.T b J U g j I c Q r.e.a.'.", +"8 a.F V B Z c 0 k G B V G G G ).", +"i.$ X X X X . X X X X X # Y.", +"[.E.D.E.F.F.E.N.E.I.F.F.F.F.F.|." +}; --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.klipper +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.klipper @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-klipper +Title: Klipper Handbook +Author: Philip.Rodrigues +Abstract: Klipper is the KDE clipboard cut and paste utility. +Section: Apps/Utils + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/klipper/index.html +Files: /usr/share/doc/kde/HTML/en/klipper/*.html + --- kdebase-3.5.6.orig/debian/kwin.postinst +++ kdebase-3.5.6/debian/kwin.postinst @@ -0,0 +1,42 @@ +#! /bin/sh +# postinst script for konqueror +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/kwin 50 + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.kicker +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.kicker @@ -0,0 +1,11 @@ +Document: kdebase-doc-html-kicker +Title: Kicker Handbook +Author: Orville Bennett, Dirk Doerflinger +Abstract: Kicker is the KDE application starter panel and is also capable of + some useful applets and extensions. +Section: Apps/Utils + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kicker/index.html +Files: /usr/share/doc/kde/HTML/en/kicker/*.html + --- kdebase-3.5.6.orig/debian/libkonq4-dev.install +++ kdebase-3.5.6/debian/libkonq4-dev.install @@ -0,0 +1,23 @@ +debian/tmp/usr/include/kde/kfileivi.h +debian/tmp/usr/include/kde/kivdirectoryoverlay.h +debian/tmp/usr/include/kde/knewmenu.h +debian/tmp/usr/include/kde/konqbookmarkmanager.h +debian/tmp/usr/include/kde/konq_defaults.h +debian/tmp/usr/include/kde/konq_dirpart.h +debian/tmp/usr/include/kde/konq_drag.h +debian/tmp/usr/include/kde/konq_events.h +debian/tmp/usr/include/kde/konq_faviconmgr.h +debian/tmp/usr/include/kde/konq_filetip.h +debian/tmp/usr/include/kde/konq_historycomm.h +debian/tmp/usr/include/kde/konq_historymgr.h +debian/tmp/usr/include/kde/konq_iconviewwidget.h +debian/tmp/usr/include/kde/konq_operations.h +debian/tmp/usr/include/kde/konq_pixmapprovider.h +debian/tmp/usr/include/kde/konq_popupmenu.h +debian/tmp/usr/include/kde/konq_propsview.h +debian/tmp/usr/include/kde/konq_settings.h +debian/tmp/usr/include/kde/konq_undo.h +debian/tmp/usr/include/kde/konq_xmlguiclient.h +debian/tmp/usr/include/kde/libkonq_export.h +debian/tmp/usr/lib/libkonq.la +debian/tmp/usr/lib/libkonq.so --- kdebase-3.5.6.orig/debian/konqueror.install +++ kdebase-3.5.6/debian/konqueror.install @@ -0,0 +1,226 @@ +debian/tmp/etc/kde3/konqsidebartng.rc +debian/tmp/usr/bin/kbookmarkmerger +debian/tmp/usr/bin/keditbookmarks +debian/tmp/usr/bin/kfmclient +debian/tmp/usr/bin/konqueror +debian/tmp/usr/lib/kde3/kcm_history.la +debian/tmp/usr/lib/kde3/kcm_history.so +debian/tmp/usr/lib/kde3/kded_konqy_preloader.la +debian/tmp/usr/lib/kde3/kded_konqy_preloader.so +debian/tmp/usr/lib/kde3/keditbookmarks.la +debian/tmp/usr/lib/kde3/keditbookmarks.so +debian/tmp/usr/lib/kde3/kfmclient.la +debian/tmp/usr/lib/kde3/kfmclient.so +debian/tmp/usr/lib/kde3/konq_aboutpage.la +debian/tmp/usr/lib/kde3/konq_aboutpage.so +debian/tmp/usr/lib/kde3/konq_iconview.la +debian/tmp/usr/lib/kde3/konq_iconview.so +debian/tmp/usr/lib/kde3/konq_listview.la +debian/tmp/usr/lib/kde3/konq_listview.so +debian/tmp/usr/lib/kde3/konq_remoteencoding.la +debian/tmp/usr/lib/kde3/konq_remoteencoding.so +debian/tmp/usr/lib/kde3/konq_shellcmdplugin.la +debian/tmp/usr/lib/kde3/konq_shellcmdplugin.so +debian/tmp/usr/lib/kde3/konq_sidebar.la +debian/tmp/usr/lib/kde3/konq_sidebar.so +debian/tmp/usr/lib/kde3/konq_sidebartree_bookmarks.la +debian/tmp/usr/lib/kde3/konq_sidebartree_bookmarks.so +debian/tmp/usr/lib/kde3/konq_sidebartree_dirtree.la +debian/tmp/usr/lib/kde3/konq_sidebartree_dirtree.so +debian/tmp/usr/lib/kde3/konq_sidebartree_history.la +debian/tmp/usr/lib/kde3/konq_sidebartree_history.so +debian/tmp/usr/lib/kde3/konqsidebar_tree.la +debian/tmp/usr/lib/kde3/konqsidebar_tree.so +debian/tmp/usr/lib/kde3/konqsidebar_web.la +debian/tmp/usr/lib/kde3/konqsidebar_web.so +debian/tmp/usr/lib/kde3/konqueror.la +debian/tmp/usr/lib/kde3/konqueror.so +debian/tmp/usr/lib/kde3/libkhtmlkttsdplugin.la +debian/tmp/usr/lib/kde3/libkhtmlkttsdplugin.so +debian/tmp/usr/lib/libkdeinit_keditbookmarks.so +debian/tmp/usr/lib/libkdeinit_kfmclient.so +debian/tmp/usr/lib/libkdeinit_konqueror.so +debian/tmp/usr/lib/libkonqsidebarplugin.so.1 +debian/tmp/usr/lib/libkonqsidebarplugin.so.1.2.0 +debian/tmp/usr/share/applications/kde/Home.desktop +debian/tmp/usr/share/applications/kde/kcmhistory.desktop +debian/tmp/usr/share/applications/kde/kfmclient.desktop +debian/tmp/usr/share/applications/kde/kfmclient_dir.desktop +debian/tmp/usr/share/applications/kde/kfmclient_html.desktop +debian/tmp/usr/share/applications/kde/kfmclient_war.desktop +debian/tmp/usr/share/applications/kde/khtml_filter.desktop +debian/tmp/usr/share/applications/kde/konqbrowser.desktop +debian/tmp/usr/share/applications/kde/konquerorsu.desktop +debian/tmp/usr/share/applnk/.hidden/konqfilemgr.desktop +debian/tmp/usr/share/applnk/Internet/keditbookmarks.desktop +debian/tmp/usr/share/applnk/konqueror.desktop +debian/tmp/usr/share/apps/kconf_update/kfmclient_3_2.upd +debian/tmp/usr/share/apps/kconf_update/kfmclient_3_2_update.sh +debian/tmp/usr/share/apps/kconf_update/konqsidebartng.upd +debian/tmp/usr/share/apps/kconf_update/move_konqsidebartng_entries.sh +debian/tmp/usr/share/apps/keditbookmarks/keditbookmarks-genui.rc +debian/tmp/usr/share/apps/keditbookmarks/keditbookmarksui.rc +debian/tmp/usr/share/apps/khtml/kpartplugins/khtmlkttsd.desktop +debian/tmp/usr/share/apps/khtml/kpartplugins/khtmlkttsd.rc +debian/tmp/usr/share/apps/konqiconview/konq_iconview.rc +debian/tmp/usr/share/apps/konqiconview/konq_multicolumnview.rc +debian/tmp/usr/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop +debian/tmp/usr/share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc +debian/tmp/usr/share/apps/konqiconview/kpartplugins/kshellcmdplugin.desktop +debian/tmp/usr/share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc +debian/tmp/usr/share/apps/konqlistview/konq_detailedlistview.rc +debian/tmp/usr/share/apps/konqlistview/konq_infolistview.rc +debian/tmp/usr/share/apps/konqlistview/konq_textview.rc +debian/tmp/usr/share/apps/konqlistview/konq_treeview.rc +debian/tmp/usr/share/apps/konqlistview/kpartplugins/kremoteencodingplugin.desktop +debian/tmp/usr/share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc +debian/tmp/usr/share/apps/konqlistview/kpartplugins/kshellcmdplugin.desktop +debian/tmp/usr/share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc +debian/tmp/usr/share/apps/konqsidebartng/add/virtualfolderadd.desktop +debian/tmp/usr/share/apps/konqsidebartng/add/webmodule_add.desktop +debian/tmp/usr/share/apps/konqsidebartng/dirtree/bookmarks_module.desktop +debian/tmp/usr/share/apps/konqsidebartng/dirtree/dirtree_module.desktop +debian/tmp/usr/share/apps/konqsidebartng/dirtree/history_module.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/bookmarks.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/history.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/home.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/remote.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/root.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/services.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/.version +debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/bookmarks.desktop +debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/history.desktop +debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/home.desktop +debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/remote.desktop +debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/root.desktop +debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/services.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/.directory +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/ftp/.directory +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/web/.directory +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/applications.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/.directory +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/media.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop +debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/settings.desktop +debian/tmp/usr/share/apps/konqsidebartng/websidebar/websidebar.html +debian/tmp/usr/share/apps/konqueror/about/box-centre-konqueror.png +debian/tmp/usr/share/apps/konqueror/about/intro.html +debian/tmp/usr/share/apps/konqueror/about/konq.css +debian/tmp/usr/share/apps/konqueror/about/launch.html +debian/tmp/usr/share/apps/konqueror/about/lightning.png +debian/tmp/usr/share/apps/konqueror/about/plugins.html +debian/tmp/usr/share/apps/konqueror/about/plugins_rtl.html +debian/tmp/usr/share/apps/konqueror/about/specs.html +debian/tmp/usr/share/apps/konqueror/about/tips.html +debian/tmp/usr/share/apps/konqueror/about/top-right-konqueror.png +debian/tmp/usr/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png +debian/tmp/usr/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png +debian/tmp/usr/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png +debian/tmp/usr/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png +debian/tmp/usr/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png +debian/tmp/usr/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +debian/tmp/usr/share/apps/konqueror/konq-simplebrowser.rc +debian/tmp/usr/share/apps/konqueror/konqueror.rc +debian/tmp/usr/share/apps/konqueror/pics/indicator_connect.png +debian/tmp/usr/share/apps/konqueror/pics/indicator_empty.png +debian/tmp/usr/share/apps/konqueror/pics/indicator_noconnect.png +debian/tmp/usr/share/apps/konqueror/pics/indicator_viewactive.png +debian/tmp/usr/share/apps/konqueror/profiles/filemanagement +debian/tmp/usr/share/apps/konqueror/profiles/webbrowsing +debian/tmp/usr/share/apps/konqueror/servicemenus/media_eject.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_mount.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_safelyremove.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/media_unmount.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-ada-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-c++h-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-ch-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-c++-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-css-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-diff-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-html-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-java-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-log-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-makefile-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-pas-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-perl-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-python-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-tcl-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-tex-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-xml-print.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/text-xslt-print.desktop +debian/tmp/usr/share/apps/konqueror/tiles/bluemorning.png +debian/tmp/usr/share/apps/konqueror/tiles/canvas.png +debian/tmp/usr/share/apps/konqueror/tiles/kde4ever.png +debian/tmp/usr/share/apps/konqueror/tiles/kenwimer.png +debian/tmp/usr/share/apps/konqueror/tiles/noise.png +debian/tmp/usr/share/apps/konqueror/tiles/paper_flieder.png +debian/tmp/usr/share/apps/konqueror/tiles/redfiber.png +debian/tmp/usr/share/autostart/konqy_preload.desktop +debian/tmp/usr/share/config.kcfg/keditbookmarks.kcfg +debian/tmp/usr/share/config.kcfg/konq_listview.kcfg +debian/tmp/usr/share/config.kcfg/konqueror.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/basics.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/bookmarks.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/browser.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/cmndline.png +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/commands.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/common +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/config.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/credits.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/dirtree.png +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/dragdrop.png +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/faq.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/filemanager.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/introduction.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/konqorg.png +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/man-kbookmarkmerger.1.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/parts.png +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/path-complete.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/plugins.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/save-settings.docbook +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/shortcut1.png +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/shortcut2.png +debian/tmp/usr/share/doc/kde/HTML/en/konqueror/sidebar.docbook +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/keditbookmarks.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/keditbookmarks.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/keditbookmarks.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/keditbookmarks.png +debian/tmp/usr/share/icons/crystalsvg/scalable/apps/kfm_home.svgz +debian/tmp/usr/share/icons/hicolor/128x128/apps/konqueror.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kfm.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/konqueror.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kfm.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/konqueror.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kfm.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/konqueror.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kfm.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/konqueror.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kfm.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/konqueror.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/konqueror.svgz +debian/tmp/usr/share/services/kded/konqy_preloader.desktop +debian/tmp/usr/share/services/konq_aboutpage.desktop +debian/tmp/usr/share/services/konq_detailedlistview.desktop +debian/tmp/usr/share/services/konq_iconview.desktop +debian/tmp/usr/share/services/konq_infolistview.desktop +debian/tmp/usr/share/services/konq_multicolumnview.desktop +debian/tmp/usr/share/services/konq_sidebartng.desktop +debian/tmp/usr/share/services/konq_textview.desktop +debian/tmp/usr/share/services/konq_treeview.desktop +debian/tmp/usr/share/servicetypes/konqaboutpage.desktop + +debian/icons/keditbookmarks.xpm /usr/share/pixmaps +debian/icons/keditbookmarks-16.xpm /usr/share/pixmaps +debian/icons/konqueror.xpm /usr/share/pixmaps +debian/icons/konqueror-16.xpm /usr/share/pixmaps +debian/icons/kfm.xpm /usr/share/pixmaps +debian/icons/kfm-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kdm.manpages +++ kdebase-3.5.6/debian/kdm.manpages @@ -0,0 +1,7 @@ +debian/local/kdm.options.5 +debian/man/genkdmconf.1 +debian/man/kdm.1 +debian/man/kdm_config.1 +debian/man/kdmctl.1 +debian/man/kdm_greet.1 +debian/man/krootimage.1 --- kdebase-3.5.6.orig/debian/kdepasswd.install +++ kdebase-3.5.6/debian/kdepasswd.install @@ -0,0 +1,35 @@ +debian/tmp/usr/bin/kdepasswd +debian/tmp/usr/lib/kde3/kcm_useraccount.la +debian/tmp/usr/lib/kde3/kcm_useraccount.so +debian/tmp/usr/share/applications/kde/kcm_useraccount.desktop +debian/tmp/usr/share/applications/kde/kdepasswd.desktop +debian/tmp/usr/share/apps/kdm/pics/users/Apple.png +debian/tmp/usr/share/apps/kdm/pics/users/BeachBall.png +debian/tmp/usr/share/apps/kdm/pics/users/Blowfish.png +debian/tmp/usr/share/apps/kdm/pics/users/Bug.png +debian/tmp/usr/share/apps/kdm/pics/users/Butterfly.png +debian/tmp/usr/share/apps/kdm/pics/users/Car.png +debian/tmp/usr/share/apps/kdm/pics/users/Cow.png +debian/tmp/usr/share/apps/kdm/pics/users/Daemon.png +debian/tmp/usr/share/apps/kdm/pics/users/Dog.png +debian/tmp/usr/share/apps/kdm/pics/users/Elephant.png +debian/tmp/usr/share/apps/kdm/pics/users/Flower.png +debian/tmp/usr/share/apps/kdm/pics/users/Frog.png +debian/tmp/usr/share/apps/kdm/pics/users/Ghost.png +debian/tmp/usr/share/apps/kdm/pics/users/Guitar.png +debian/tmp/usr/share/apps/kdm/pics/users/Heart.png +debian/tmp/usr/share/apps/kdm/pics/users/Konqui.png +debian/tmp/usr/share/apps/kdm/pics/users/Lion.png +debian/tmp/usr/share/apps/kdm/pics/users/Monkey.png +debian/tmp/usr/share/apps/kdm/pics/users/Penguin.png +debian/tmp/usr/share/apps/kdm/pics/users/Pig.png +debian/tmp/usr/share/apps/kdm/pics/users/Rabbit.png +debian/tmp/usr/share/apps/kdm/pics/users/Ring.png +debian/tmp/usr/share/apps/kdm/pics/users/Scream.png +debian/tmp/usr/share/apps/kdm/pics/users/Shark.png +debian/tmp/usr/share/apps/kdm/pics/users/Splash.png +debian/tmp/usr/share/apps/kdm/pics/users/Star.png +debian/tmp/usr/share/apps/kdm/pics/users/Teddybear.png +debian/tmp/usr/share/apps/kdm/pics/users/Turtle.png +debian/tmp/usr/share/config.kcfg/kcm_useraccount.kcfg +debian/tmp/usr/share/config.kcfg/kcm_useraccount_pass.kcfg --- kdebase-3.5.6.orig/debian/kpersonalizer.manpages +++ kdebase-3.5.6/debian/kpersonalizer.manpages @@ -0,0 +1 @@ +debian/man/kpersonalizer.1 --- kdebase-3.5.6.orig/debian/kdebase-bin.install +++ kdebase-3.5.6/debian/kdebase-bin.install @@ -0,0 +1,107 @@ +debian/tmp/etc/kde3/kxkb_groups +debian/tmp/usr/bin/drkonqi +debian/tmp/usr/bin/kapplymousetheme +debian/tmp/usr/bin/kblankscrn.kss +debian/tmp/usr/bin/kcheckpass +debian/tmp/usr/bin/kcminit +debian/tmp/usr/bin/kcminit_startup +debian/tmp/usr/bin/kdcop +debian/tmp/usr/bin/kdebugdialog +debian/tmp/usr/bin/kdesu +debian/tmp/usr/bin/kdesud +debian/tmp/usr/bin/kdialog +debian/tmp/usr/bin/khotkeys +debian/tmp/usr/bin/kio_system_documenthelper +debian/tmp/usr/bin/knetattach +debian/tmp/usr/bin/krandom.kss +debian/tmp/usr/bin/kreadconfig +debian/tmp/usr/bin/kstart +debian/tmp/usr/bin/ksystraycmd +debian/tmp/usr/bin/kwriteconfig +debian/tmp/usr/bin/kxkb +debian/tmp/usr/lib/kconf_update_bin/khotkeys_update +debian/tmp/usr/lib/kde3/kcminit.la +debian/tmp/usr/lib/kde3/kcminit.so +debian/tmp/usr/lib/kde3/kcminit_startup.la +debian/tmp/usr/lib/kde3/kcminit_startup.so +debian/tmp/usr/lib/kde3/kcm_keyboard.la +debian/tmp/usr/lib/kde3/kcm_keyboard.so +debian/tmp/usr/lib/kde3/kcm_khotkeys_init.la +debian/tmp/usr/lib/kde3/kcm_khotkeys_init.so +debian/tmp/usr/lib/kde3/kcm_khotkeys.la +debian/tmp/usr/lib/kde3/kcm_khotkeys.so +debian/tmp/usr/lib/kde3/kded_khotkeys.la +debian/tmp/usr/lib/kde3/kded_khotkeys.so +debian/tmp/usr/lib/kde3/kgreet_classic.la +debian/tmp/usr/lib/kde3/kgreet_classic.so +debian/tmp/usr/lib/kde3/kgreet_winbind.la +debian/tmp/usr/lib/kde3/kgreet_winbind.so +debian/tmp/usr/lib/kde3/khotkeys_arts.la +debian/tmp/usr/lib/kde3/khotkeys_arts.so +debian/tmp/usr/lib/kde3/khotkeys.la +debian/tmp/usr/lib/kde3/khotkeys.so +debian/tmp/usr/lib/kde3/kxkb.la +debian/tmp/usr/lib/kde3/kxkb.so +debian/tmp/usr/lib/libkdeinit_kcminit.so +debian/tmp/usr/lib/libkdeinit_kcminit_startup.la +debian/tmp/usr/lib/libkdeinit_kcminit_startup.so +debian/tmp/usr/lib/libkdeinit_khotkeys.so +debian/tmp/usr/lib/libkdeinit_kxkb.so +debian/tmp/usr/lib/libkhotkeys_shared.so.1 +debian/tmp/usr/lib/libkhotkeys_shared.so.1.0.0 +debian/tmp/usr/share/applications/kde/keyboard.desktop +debian/tmp/usr/share/applications/kde/keyboard_layout.desktop +debian/tmp/usr/share/applications/kde/khotkeys.desktop +debian/tmp/usr/share/applications/kde/knetattach.desktop +debian/tmp/usr/share/applnk/System/ScreenSavers/KBlankscreen.desktop +debian/tmp/usr/share/applnk/System/ScreenSavers/KRandom.desktop +debian/tmp/usr/share/apps/drkonqi/debuggers/gdbrc +debian/tmp/usr/share/apps/drkonqi/pics/konqi.png +debian/tmp/usr/share/apps/drkonqi/presets/developerrc +debian/tmp/usr/share/apps/drkonqi/presets/enduserrc +debian/tmp/usr/share/apps/kconf_update/khotkeys_32b1_update.upd +debian/tmp/usr/share/apps/kconf_update/khotkeys_printscreen.upd +debian/tmp/usr/share/apps/kconf_update/konqueror_gestures_kde321_update.upd +debian/tmp/usr/share/apps/kdcop/kdcopui.rc +debian/tmp/usr/share/apps/khotkeys/kde32b1.khotkeys +debian/tmp/usr/share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +debian/tmp/usr/share/apps/khotkeys/printscreen.khotkeys +debian/tmp/usr/share/autostart/khotkeys.desktop +debian/tmp/usr/share/doc/kde/HTML/en/kdcop/common +debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/common +debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdesu/common +debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdesu/man-kdesu.1.docbook +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/common +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot2.png +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot3.png +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot4.png +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot.png +debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot1.png +debian/tmp/usr/share/doc/kde/HTML/en/kxkb/common +debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kxkb/layout.png +debian/tmp/usr/share/doc/kde/HTML/en/kxkb/switching.png +debian/tmp/usr/share/doc/kde/HTML/en/kxkb/xkb.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/knetattach.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/khotkeys.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/knetattach.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kxkb.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/knetattach.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/khotkeys.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/knetattach.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kxkb.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/knetattach.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kxkb.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/knetattach.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/knetattach.svgz +debian/tmp/usr/share/services/kded/khotkeys.desktop +debian/tmp/usr/share/services/kxkb.desktop --- kdebase-3.5.6.orig/debian/kicker.menu +++ kdebase-3.5.6/debian/kicker.menu @@ -0,0 +1,9 @@ +?package(kicker):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="Kicker"\ + icon="/usr/share/pixmaps/kicker.xpm"\ + command="/usr/bin/kicker" + +# Icon 16x16 kicker/data/icons/cr16-app-kicker.png kicker.xpm --- kdebase-3.5.6.orig/debian/compat +++ kdebase-3.5.6/debian/compat @@ -0,0 +1 @@ +5 --- kdebase-3.5.6.orig/debian/kdebase-kio-plugins.install +++ kdebase-3.5.6/debian/kdebase-kio-plugins.install @@ -0,0 +1,226 @@ +debian/tmp/usr/bin/kio_media_mounthelper +debian/tmp/usr/bin/ktrash +debian/tmp/usr/lib/kde3/cursorthumbnail.la +debian/tmp/usr/lib/kde3/cursorthumbnail.so +debian/tmp/usr/lib/kde3/djvuthumbnail.la +debian/tmp/usr/lib/kde3/djvuthumbnail.so +debian/tmp/usr/lib/kde3/exrthumbnail.la +debian/tmp/usr/lib/kde3/exrthumbnail.so +debian/tmp/usr/lib/kde3/htmlthumbnail.la +debian/tmp/usr/lib/kde3/htmlthumbnail.so +debian/tmp/usr/lib/kde3/imagethumbnail.la +debian/tmp/usr/lib/kde3/imagethumbnail.so +debian/tmp/usr/lib/kde3/kcm_cgi.la +debian/tmp/usr/lib/kde3/kcm_cgi.so +debian/tmp/usr/lib/kde3/kcm_media.la +debian/tmp/usr/lib/kde3/kcm_media.so +debian/tmp/usr/lib/kde3/kded_homedirnotify.la +debian/tmp/usr/lib/kde3/kded_homedirnotify.so +debian/tmp/usr/lib/kde3/kded_mediamanager.la +debian/tmp/usr/lib/kde3/kded_mediamanager.so +debian/tmp/usr/lib/kde3/kded_medianotifier.la +debian/tmp/usr/lib/kde3/kded_medianotifier.so +debian/tmp/usr/lib/kde3/kded_remotedirnotify.la +debian/tmp/usr/lib/kde3/kded_remotedirnotify.so +debian/tmp/usr/lib/kde3/kded_systemdirnotify.la +debian/tmp/usr/lib/kde3/kded_systemdirnotify.so +debian/tmp/usr/lib/kde3/kfile_media.la +debian/tmp/usr/lib/kde3/kfile_media.so +debian/tmp/usr/lib/kde3/kfile_trash.la +debian/tmp/usr/lib/kde3/kfile_trash.so +debian/tmp/usr/lib/kde3/kio_about.la +debian/tmp/usr/lib/kde3/kio_about.so +debian/tmp/usr/lib/kde3/kio_cgi.la +debian/tmp/usr/lib/kde3/kio_cgi.so +debian/tmp/usr/lib/kde3/kio_filter.la +debian/tmp/usr/lib/kde3/kio_filter.so +debian/tmp/usr/lib/kde3/kio_finger.la +debian/tmp/usr/lib/kde3/kio_finger.so +debian/tmp/usr/lib/kde3/kio_fish.la +debian/tmp/usr/lib/kde3/kio_fish.so +debian/tmp/usr/lib/kde3/kio_floppy.la +debian/tmp/usr/lib/kde3/kio_floppy.so +debian/tmp/usr/lib/kde3/kio_home.la +debian/tmp/usr/lib/kde3/kio_home.so +debian/tmp/usr/lib/kde3/kio_info.la +debian/tmp/usr/lib/kde3/kio_info.so +debian/tmp/usr/lib/kde3/kio_ldap.la +debian/tmp/usr/lib/kde3/kio_ldap.so +debian/tmp/usr/lib/kde3/kio_mac.la +debian/tmp/usr/lib/kde3/kio_mac.so +debian/tmp/usr/lib/kde3/kio_man.la +debian/tmp/usr/lib/kde3/kio_man.so +debian/tmp/usr/lib/kde3/kio_media.la +debian/tmp/usr/lib/kde3/kio_media.so +debian/tmp/usr/lib/kde3/kio_nfs.la +debian/tmp/usr/lib/kde3/kio_nfs.so +debian/tmp/usr/lib/kde3/kio_nntp.la +debian/tmp/usr/lib/kde3/kio_nntp.so +debian/tmp/usr/lib/kde3/kio_pop3.la +debian/tmp/usr/lib/kde3/kio_pop3.so +debian/tmp/usr/lib/kde3/kio_remote.la +debian/tmp/usr/lib/kde3/kio_remote.so +debian/tmp/usr/lib/kde3/kio_settings.la +debian/tmp/usr/lib/kde3/kio_settings.so +debian/tmp/usr/lib/kde3/kio_sftp.la +debian/tmp/usr/lib/kde3/kio_sftp.so +debian/tmp/usr/lib/kde3/kio_smb.la +debian/tmp/usr/lib/kde3/kio_smb.so +debian/tmp/usr/lib/kde3/kio_smtp.la +debian/tmp/usr/lib/kde3/kio_smtp.so +debian/tmp/usr/lib/kde3/kio_system.la +debian/tmp/usr/lib/kde3/kio_system.so +debian/tmp/usr/lib/kde3/kio_tar.la +debian/tmp/usr/lib/kde3/kio_tar.so +debian/tmp/usr/lib/kde3/kio_thumbnail.la +debian/tmp/usr/lib/kde3/kio_thumbnail.so +debian/tmp/usr/lib/kde3/kio_trash.la +debian/tmp/usr/lib/kde3/kio_trash.so +debian/tmp/usr/lib/kde3/libkmanpart.la +debian/tmp/usr/lib/kde3/libkmanpart.so +debian/tmp/usr/lib/kde3/media_propsdlgplugin.la +debian/tmp/usr/lib/kde3/media_propsdlgplugin.so +debian/tmp/usr/lib/kde3/textthumbnail.la +debian/tmp/usr/lib/kde3/textthumbnail.so +debian/tmp/usr/share/applications/kde/kcmcgi.desktop +debian/tmp/usr/share/apps/kio_finger/kio_finger.css +debian/tmp/usr/share/apps/kio_finger/kio_finger.pl +debian/tmp/usr/share/apps/kio_info/kde-info2html +debian/tmp/usr/share/apps/kio_info/kde-info2html.conf +debian/tmp/usr/share/apps/kio_man/kio_man.css +debian/tmp/usr/share/apps/konqueror/dirtree/remote/smb-network.desktop +debian/tmp/usr/share/apps/remoteview/smb-network.desktop +debian/tmp/usr/share/apps/systemview/documents.desktop +debian/tmp/usr/share/apps/systemview/home.desktop +debian/tmp/usr/share/apps/systemview/media.desktop +debian/tmp/usr/share/apps/systemview/remote.desktop +debian/tmp/usr/share/apps/systemview/users.desktop +debian/tmp/usr/share/config.kcfg/mediamanagersettings.kcfg +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/bzip2.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/bzip.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/cgi.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/common +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/data.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/file.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/finger.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/fish.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/floppy.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/ftp.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/gopher.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/gzip.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/help.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/http.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/https.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/imap.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/imaps.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/info.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/lan.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/ldap.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/mac.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/mailto.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/man.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/mrml.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/news.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/nfs.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/nntp.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/pop3.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/pop3s.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/print.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/rlan.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/rlogin.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/sftp.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/smb.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/smtp.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/tar.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/telnet.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/thumbnail.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/webdav.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kioslave/webdavs.docbook +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/mac.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/mac.png +debian/tmp/usr/share/mimelnk/application/x-smb-server.desktop +debian/tmp/usr/share/mimelnk/application/x-smb-workgroup.desktop +debian/tmp/usr/share/mimelnk/inode/system_directory.desktop +debian/tmp/usr/share/mimelnk/media/audiocd.desktop +debian/tmp/usr/share/mimelnk/media/blankcd.desktop +debian/tmp/usr/share/mimelnk/media/blankdvd.desktop +debian/tmp/usr/share/mimelnk/media/camera_mounted.desktop +debian/tmp/usr/share/mimelnk/media/camera_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/cdrom_mounted.desktop +debian/tmp/usr/share/mimelnk/media/cdrom_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/cdwriter_mounted.desktop +debian/tmp/usr/share/mimelnk/media/cdwriter_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/dvd_mounted.desktop +debian/tmp/usr/share/mimelnk/media/dvd_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/dvdvideo.desktop +debian/tmp/usr/share/mimelnk/media/floppy5_mounted.desktop +debian/tmp/usr/share/mimelnk/media/floppy5_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/floppy_mounted.desktop +debian/tmp/usr/share/mimelnk/media/floppy_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/gphoto2camera.desktop +debian/tmp/usr/share/mimelnk/media/hdd_mounted.desktop +debian/tmp/usr/share/mimelnk/media/hdd_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/nfs_mounted.desktop +debian/tmp/usr/share/mimelnk/media/nfs_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/removable_mounted.desktop +debian/tmp/usr/share/mimelnk/media/removable_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/smb_mounted.desktop +debian/tmp/usr/share/mimelnk/media/smb_unmounted.desktop +debian/tmp/usr/share/mimelnk/media/svcd.desktop +debian/tmp/usr/share/mimelnk/media/vcd.desktop +debian/tmp/usr/share/mimelnk/media/zip_mounted.desktop +debian/tmp/usr/share/mimelnk/media/zip_unmounted.desktop +debian/tmp/usr/share/services/about.protocol +debian/tmp/usr/share/services/applications.protocol +debian/tmp/usr/share/services/ar.protocol +debian/tmp/usr/share/services/bzip2.protocol +debian/tmp/usr/share/services/bzip.protocol +debian/tmp/usr/share/services/cgi.protocol +debian/tmp/usr/share/services/cursorthumbnail.desktop +debian/tmp/usr/share/services/djvuthumbnail.desktop +debian/tmp/usr/share/services/exrthumbnail.desktop +debian/tmp/usr/share/services/finger.protocol +debian/tmp/usr/share/services/fish.protocol +debian/tmp/usr/share/services/floppy.protocol +debian/tmp/usr/share/services/gzip.protocol +debian/tmp/usr/share/services/home.protocol +debian/tmp/usr/share/services/htmlthumbnail.desktop +debian/tmp/usr/share/services/imagethumbnail.desktop +debian/tmp/usr/share/services/info.protocol +debian/tmp/usr/share/services/kded/homedirnotify.desktop +debian/tmp/usr/share/services/kded/mediamanager.desktop +debian/tmp/usr/share/services/kded/medianotifier.desktop +debian/tmp/usr/share/services/kded/remotedirnotify.desktop +debian/tmp/usr/share/services/kded/systemdirnotify.desktop +debian/tmp/usr/share/services/kfile_media.desktop +debian/tmp/usr/share/services/kfile_trash.desktop +debian/tmp/usr/share/services/kfile_trash_system.desktop +debian/tmp/usr/share/services/kmanpart.desktop +debian/tmp/usr/share/services/ldap.protocol +debian/tmp/usr/share/services/ldaps.protocol +debian/tmp/usr/share/services/mac.protocol +debian/tmp/usr/share/services/man.protocol +debian/tmp/usr/share/services/media.protocol +debian/tmp/usr/share/services/media_propsdlgplugin.desktop +debian/tmp/usr/share/services/nfs.protocol +debian/tmp/usr/share/services/nntp.protocol +debian/tmp/usr/share/services/nntps.protocol +debian/tmp/usr/share/services/nxfish.protocol +debian/tmp/usr/share/services/pop3.protocol +debian/tmp/usr/share/services/pop3s.protocol +debian/tmp/usr/share/services/programs.protocol +debian/tmp/usr/share/services/remote.protocol +debian/tmp/usr/share/services/settings.protocol +debian/tmp/usr/share/services/sftp.protocol +debian/tmp/usr/share/services/smb.protocol +debian/tmp/usr/share/services/smtp.protocol +debian/tmp/usr/share/services/smtps.protocol +debian/tmp/usr/share/services/system.protocol +debian/tmp/usr/share/services/tar.protocol +debian/tmp/usr/share/services/textthumbnail.desktop +debian/tmp/usr/share/services/thumbnail.protocol +debian/tmp/usr/share/services/trash.protocol +debian/tmp/usr/share/services/zip.protocol +debian/tmp/usr/share/servicetypes/thumbcreator.desktop --- kdebase-3.5.6.orig/debian/kpager.manpages +++ kdebase-3.5.6/debian/kpager.manpages @@ -0,0 +1 @@ +debian/man/kpager.1 --- kdebase-3.5.6.orig/debian/kdm.config +++ kdebase-3.5.6/debian/kdm.config @@ -0,0 +1,80 @@ +#!/bin/sh +# Debian kdm package configuration script +# stolen from the xdm scripts +# Copyright 2000--2003 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +set -e + +# source debconf library +. /usr/share/debconf/confmodule + +THIS_PACKAGE=kdm + +# set default display manager +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +OWNERS= +if db_metaget shared/default-x-display-manager owners; then + OWNERS="$RET" +fi + +CHOICES= +if db_metaget shared/default-x-display-manager choices; then + CHOICES="$RET" +fi + +if [ "$OWNERS" != "$CHOICES" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + # observe "X display managers now available are \"$OWNERS\"" + db_subst shared/default-x-display-manager choices "$OWNERS" + db_fset shared/default-x-display-manager seen false +fi + +# debconf is not a registry; use the current contents of the default display +# manager file to pre-answer the question if possible +if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + CURRENT_DEFAULT=$(basename "$(grep -v '^[[:space:]]*#' \ + "$DEFAULT_DISPLAY_MANAGER_FILE" | + head -n 1)") + if [ -n "$CURRENT_DEFAULT" ]; then + if ! which "$CURRENT_DEFAULT" > /dev/null 2>&1; then + echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "default display manager \"$CURRENT_DEFAULT\" specified in" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE does not exist or is not" \ + # "executable" + fi + db_set shared/default-x-display-manager "$CURRENT_DEFAULT" + fi +else + CURRENT_DEFAULT= + if db_get shared/default-x-display-manager; then + CURRENT_DEFAULT="$RET" + fi +fi + +db_input high shared/default-x-display-manager || true +db_go + +# using this display manager? +NEW_DEFAULT= +if db_get shared/default-x-display-manager; then + NEW_DEFAULT="$RET" +fi + +# move the default display manager file if we're going to change it +if [ -n "$NEW_DEFAULT" ]; then + if [ "$NEW_DEFAULT" != "$CURRENT_DEFAULT" ]; then + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + # observe "preparing to change default X display manager from" \ + # "\"$CURRENT_DEFAULT\" to \"$NEW_DEFAULT\"" + mv "$DEFAULT_DISPLAY_MANAGER_FILE" \ + "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" + fi + fi +fi + +exit 0 --- kdebase-3.5.6.orig/debian/kdm-np.pam +++ kdebase-3.5.6/debian/kdm-np.pam @@ -0,0 +1,11 @@ +# +# /etc/pam.d/kdm-np - specify the PAM behaviour of kdm for passwordless logins +# +auth required pam_nologin.so +auth required pam_env.so readenv=1 +auth required pam_env.so readenv=1 envfile=/etc/default/locale +session required pam_limits.so +@include common-account +@include common-password +@include common-session +auth required pam_permit.so --- kdebase-3.5.6.orig/debian/kdesktop.lintian +++ kdebase-3.5.6/debian/kdesktop.lintian @@ -0,0 +1 @@ +kdesktop: no-shlibs-control-file usr/lib/libkdeinit_kdesktop.so --- kdebase-3.5.6.orig/debian/kcontrol.lintian +++ kdebase-3.5.6/debian/kcontrol.lintian @@ -0,0 +1,3 @@ +kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so +kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so +kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so --- kdebase-3.5.6.orig/debian/konqueror.presubj +++ kdebase-3.5.6/debian/konqueror.presubj @@ -0,0 +1,30 @@ +Reporting a konqueror crash +--------------------------- + +When you report a konqueror crash, it is important to provide: + * the exact steps to reproduce the crash (URL of the site, the exact + actions you performed...) + * a useful backtrace of the crash + +To produce a useful backtrace, you must have qt-x11-free-dbg, kdelibs-dbg, +and kdebase-dbg installed. A backtrace full of "(no debugging symbols +found)" is useless. + +A bug that is not reproducible, or that lacks the necessary backtrace, will +be discarded. + + +Reporting a rendering bug +------------------------- + +Please provide the URL of the page that doesn't display correctly. Explain +clearly what you expect, and what you actually get. + +Small screenshots of the part that has a problem are of great help and can +be attached to the bug report. Screenshots of the "correct" behaviour +(taken on another graphical browser) may also help. + +Any bug that states "Site foo is not rendered correctly" with no further +information will be discarded (even if at the time of the report the defect +is obvious, with newer versions of KDE it can be hard to see if the defect +is still present, since the error might have been subtle for all we know). --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.kpager +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.kpager @@ -0,0 +1,12 @@ +Document: kdebase-doc-html-kpager +Title: KPager Handbook +Author: Dirk Doerflinger +Abstract: KPager gives you a thumbnail sketch of all your desktops. It is a handy + tool to let you see, resize or close windows on any desktop and move windows + around within or between desktops. +Section: Apps/Utils + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kpager/index.html +Files: /usr/share/doc/kde/HTML/en/kpager/*.html + --- kdebase-3.5.6.orig/debian/NEWS +++ kdebase-3.5.6/debian/NEWS @@ -0,0 +1,74 @@ +kdebase (4:3.4.2-3) unstable; urgency=low + + *** Changes to KDM conffiles: + + * Users upgrading KDM from 3.3.x, will find that KDM no longer uses the + /etc/kde3/kdm/Xservers file, if /etc/kde3/kdm/kdmrc was updated to + the version shipped with KDM 3.4.x. The package upgrade scripts + will not remove Xservers even if kdmrc has been upgraded, if they detect + local modifications. This should allow administrators to merge their + Xservers changes into kdmrc before themselves removing Xservers. The new + ServerArgsLocal key in kdmrc is where most old Xservers customizations + should be placed. + + * Irrespective of the removal of the Xservers file, we highly recommend that + all administrators accept the installation of the updated kdmrc file + during the package upgrade. Many important changes to KDM's defaults have + been made, and KDM is exceedingly bad at handling anything but the latest + kdmrc format, so the nuissance of re-customizing KDM will likely prove + less than the nuissance of dealing with a KDM that isn't working properly. + If you have already upgraded KDM package without accepting the new kdmrc, + purging and reinstalling the package should achieve the desired result. + + *** Changes to user login script handling: + + * Another important change that users upgrading from KDM 3.3.x may notice + is that KDM's ability to source personal login scripts, long disabled, has + been restored. The exact files sourced on login will depend on the user's + choice of shell. For users of bash, KDM will source /etc/profile, followed + by ~/.bash_profile or, if that is not present, ~/.profile. Note that KDM + is NOT spawning a login shell, but is merely mimicking the behaviour that + popular shells would exhibit if they were login shells, by manually + sourcing the customary login scripts. /etc/kde3/kdm/Xsession controls this + behaviour. + + * The important downside of the above approach is that KDM will utterly fail + to start a user's session if the newly sourced files contain certain types + of commands. For instance, many commands will cause the login attempt to + fail because they expect an interactive shell, or because you are trying + to "exec" something that cannot provide an X session. For instance, + "exec ksmserver" will launch KDE, but "exec bash" will fail. Thus if you + are unsure why KDM is refusing to start your session, try commenting out + elements of the newly sourced login scripts, and you may find the problem + resolved. + + -- Debian Qt/KDE Maintainers Thu, 8 Sep 2005 11:13:41 -0400 + +kdebase (4:3.3.2-1) unstable; urgency=low + + * Users upgrading from KDE 3.2 might find that their keyboards seem no longer + to work in KDM. This problem is caused by a change in KDE's handling of + virtual terminals. The setting which puts KDM on vt7, which was contained + in /etc/kde3/kdm/Xservers, has changed, and is also now located in + /etc/kde3/kdm/kdmrc. + + * Users who, when upgrading to KDE 3.3, opted to replace their Xservers file + with the version shipped by the package, but chose to retain their + /etc/kde3/kdm/kdmrc file, will thus have a KDM configuration which nowhere + contains a setting which properly places KDM on vt7. This can result in a + race condition which has the end effect of breaking the keyboard when using + KDM. + + * The solution to the problem is either to replace both of Xservers and + kdmrc, or neither, when upgrading to KDE 3.3 for the first time. + + * Users already stuck can, after killing KDE, purge and re-install the kdm + package, ensuring that the latest, fresh copies are installed. + Alternatively, they can edit /etc/kde3/kdm/kdmrc and add the following + line: + + ServerVTs=-7 + + in the [General] section of the file. + + -- Debian Qt/KDE Maintainers Sun, 23 Jan 2005 16:11:07 +0100 --- kdebase-3.5.6.orig/debian/cdbs/versions.pl +++ kdebase-3.5.6/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; --- kdebase-3.5.6.orig/debian/cdbs/debian-qt-kde.mk +++ kdebase-3.5.6/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,108 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \ + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \ + fi + touch debian/stamp-cvs-make + +include /usr/share/cdbs/1/class/kde.mk$(_cdbs_makefile_suffix) + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi + rm -f debian/stamp-cvs-make + +endif --- kdebase-3.5.6.orig/debian/kfind.menu +++ kdebase-3.5.6/debian/kfind.menu @@ -0,0 +1,11 @@ +?package(kfind):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KFind"\ + icon32x32="/usr/share/pixmaps/kfind.xpm"\ + icon16x16="/usr/share/pixmaps/kfind-16.xpm"\ + command="/usr/bin/kfind" + +# Icon 32x32 kfind/cr32-app-kfind.png kfind.xpm +# Icon 16x16 kfind/cr16-app-kfind.png kfind-16.xpm --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.ksysguard +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.ksysguard @@ -0,0 +1,11 @@ +Document: kdebase-doc-html-ksysguard +Title: KSysGuard Handbook +Author: Chris Schlaeger +Abstract: KSysGuard is a network enabled task manager and system monitor + application, with the additional functionality of top. +Section: Apps/System + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/ksysguard/index.html +Files: /usr/share/doc/kde/HTML/en/ksysguard/*.html + --- kdebase-3.5.6.orig/debian/copyright +++ kdebase-3.5.6/debian/copyright @@ -0,0 +1,444 @@ +This package was debianized by Christopher L Cheney on +Tue, 16 Apr 2002 22:00:00 -0500. + +It was downloaded from: http://www.kde.org/download + +Upstream Authors: Stephan Kulow and many others. + +License: + +All programs are either under the GPL or LGPL. On Debian systems, +the complete text of the GPL and LGPL licenses can be found in the +/usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files. + +When in doubt, check the individual file, they should all have license +headings and other identifying marks. + +Artistic +-------- +kdcop, kdesu, klipper + +BSD +--- +drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport + +GPL +--- +kappfinder, kate, kcheckpass, kdeprint, kdm, kfind, khelpcenter, kmenuedit, +konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip + +LGPL +---- +kdebugdialog, kdesktop, khotkeys, kxkb, libkonq, nsplugins + +---------------------- + +DocBook Documentation: + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.1 or any later version published by the Free Software + Foundation; with no Invariant Sections, with no Front-Cover Texts, + and with no Back-Cover Texts. + + A copy of the GNU Free Documentation License (Version 1.2) is + included below. + + + GNU Free Documentation License + Version 1.2, November 2002 + + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301, USA. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + 0. PREAMBLE + + The purpose of this License is to make a manual, textbook, or other + functional and useful document "free" in the sense of freedom: to + assure everyone the effective freedom to copy and redistribute it, + with or without modifying it, either commercially or noncommercially. + Secondarily, this License preserves for the author and publisher a way + to get credit for their work, while not being considered responsible + for modifications made by others. + + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. It + complements the GNU General Public License, which is a copyleft + license designed for free software. + + We have designed this License in order to use it for manuals for free + software, because free software needs free documentation: a free + program should come with manuals providing the same freedoms that the + software does. But this License is not limited to software manuals; + it can be used for any textual work, regardless of subject matter or + whether it is published as a printed book. We recommend this License + principally for works whose purpose is instruction or reference. + + + 1. APPLICABILITY AND DEFINITIONS + + This License applies to any manual or other work, in any medium, that + contains a notice placed by the copyright holder saying it can be + distributed under the terms of this License. Such a notice grants a + world-wide, royalty-free license, unlimited in duration, to use that + work under the conditions stated herein. The "Document", below, + refers to any such manual or work. Any member of the public is a + licensee, and is addressed as "you". You accept the license if you + copy, modify or distribute the work in a way requiring permission + under copyright law. + + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + + A "Secondary Section" is a named appendix or a front-matter section of + the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall subject + (or to related matters) and contains nothing that could fall directly + within that overall subject. (Thus, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of legal, + commercial, philosophical, ethical or political position regarding + them. + + The "Invariant Sections" are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the notice + that says that the Document is released under this License. If a + section does not fit the above definition of Secondary then it is not + allowed to be designated as Invariant. The Document may contain zero + Invariant Sections. If the Document does not identify any Invariant + Sections then there are none. + + The "Cover Texts" are certain short passages of text that are listed, + as Front-Cover Texts or Back-Cover Texts, in the notice that says that + the Document is released under this License. A Front-Cover Text may + be at most 5 words, and a Back-Cover Text may be at most 25 words. + + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, that is suitable for revising the document + straightforwardly with generic text editors or (for images composed of + pixels) generic paint programs or (for drawings) some widely available + drawing editor, and that is suitable for input to text formatters or + for automatic translation to a variety of formats suitable for input + to text formatters. A copy made in an otherwise Transparent file + format whose markup, or absence of markup, has been arranged to thwart + or discourage subsequent modification by readers is not Transparent. + An image format is not Transparent if used for any substantial amount + of text. A copy that is not "Transparent" is called "Opaque". + + Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, SGML + or XML using a publicly available DTD, and standard-conforming simple + HTML, PostScript or PDF designed for human modification. Examples of + transparent image formats include PNG, XCF and JPG. Opaque formats + include proprietary formats that can be read and edited only by + proprietary word processors, SGML or XML for which the DTD and/or + processing tools are not generally available, and the + machine-generated HTML, PostScript or PDF produced by some word + processors for output purposes only. + + The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the material + this License requires to appear in the title page. For works in + formats which do not have any title page as such, "Title Page" means + the text near the most prominent appearance of the work's title, + preceding the beginning of the body of the text. + + A section "Entitled XYZ" means a named subunit of the Document whose + title either is precisely XYZ or contains XYZ in parentheses following + text that translates XYZ in another language. (Here XYZ stands for a + specific section name mentioned below, such as "Acknowledgements", + "Dedications", "Endorsements", or "History".) To "Preserve the Title" + of such a section when you modify the Document means that it remains a + section "Entitled XYZ" according to this definition. + + The Document may include Warranty Disclaimers next to the notice which + states that this License applies to the Document. These Warranty + Disclaimers are considered to be included by reference in this + License, but only as regards disclaiming warranties: any other + implication that these Warranty Disclaimers may have is void and has + no effect on the meaning of this License. + + + 2. VERBATIM COPYING + + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License applies + to the Document are reproduced in all copies, and that you add no other + conditions whatsoever to those of this License. You may not use + technical measures to obstruct or control the reading or further + copying of the copies you make or distribute. However, you may accept + compensation in exchange for copies. If you distribute a large enough + number of copies you must also follow the conditions in section 3. + + You may also lend copies, under the same conditions stated above, and + you may publicly display copies. + + + 3. COPYING IN QUANTITY + + If you publish printed copies (or copies in media that commonly have + printed covers) of the Document, numbering more than 100, and the + Document's license notice requires Cover Texts, you must enclose the + copies in covers that carry, clearly and legibly, all these Cover + Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on + the back cover. Both covers must also clearly and legibly identify + you as the publisher of these copies. The front cover must present + the full title with all words of the title equally prominent and + visible. You may add other material on the covers in addition. + Copying with changes limited to the covers, as long as they preserve + the title of the Document and satisfy these conditions, can be treated + as verbatim copying in other respects. + + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto adjacent + pages. + + If you publish or distribute Opaque copies of the Document numbering + more than 100, you must either include a machine-readable Transparent + copy along with each Opaque copy, or state in or with each Opaque copy + a computer-network location from which the general network-using + public has access to download using public-standard network protocols + a complete Transparent copy of the Document, free of added material. + If you use the latter option, you must take reasonably prudent steps, + when you begin distribution of Opaque copies in quantity, to ensure + that this Transparent copy will remain thus accessible at the stated + location until at least one year after the last time you distribute an + Opaque copy (directly or through your agents or retailers) of that + edition to the public. + + It is requested, but not required, that you contact the authors of the + Document well before redistributing any large number of copies, to give + them a chance to provide you with an updated version of the Document. + + + 4. MODIFICATIONS + + You may copy and distribute a Modified Version of the Document under + the conditions of sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the Modified + Version filling the role of the Document, thus licensing distribution + and modification of the Modified Version to whoever possesses a copy + of it. In addition, you must do these things in the Modified Version: + + A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. + B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. + C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. + D. Preserve all the copyright notices of the Document. + E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. + G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. + H. Include an unaltered copy of this License. + I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. + J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. + K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. + L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. + M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. + N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. + O. Preserve any Warranty Disclaimers. + + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no material + copied from the Document, you may at your option designate some or all + of these sections as invariant. To do this, add their titles to the + list of Invariant Sections in the Modified Version's license notice. + These titles must be distinct from any other section titles. + + You may add a section Entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text has + been approved by an organization as the authoritative definition of a + standard. + + You may add a passage of up to five words as a Front-Cover Text, and a + passage of up to 25 words as a Back-Cover Text, to the end of the list + of Cover Texts in the Modified Version. Only one passage of + Front-Cover Text and one of Back-Cover Text may be added by (or + through arrangements made by) any one entity. If the Document already + includes a cover text for the same cover, previously added by you or + by arrangement made by the same entity you are acting on behalf of, + you may not add another; but you may replace the old one, on explicit + permission from the previous publisher that added the old one. + + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to assert or + imply endorsement of any Modified Version. + + + 5. COMBINING DOCUMENTS + + You may combine the Document with other documents released under this + License, under the terms defined in section 4 above for modified + versions, provided that you include in the combination all of the + Invariant Sections of all of the original documents, unmodified, and + list them all as Invariant Sections of your combined work in its + license notice, and that you preserve all their Warranty Disclaimers. + + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name but + different contents, make the title of each such section unique by + adding at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique number. + Make the same adjustment to the section titles in the list of + Invariant Sections in the license notice of the combined work. + + In the combination, you must combine any sections Entitled "History" + in the various original documents, forming one section Entitled + "History"; likewise combine any sections Entitled "Acknowledgements", + and any sections Entitled "Dedications". You must delete all sections + Entitled "Endorsements". + + + 6. COLLECTIONS OF DOCUMENTS + + You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies of this + License in the various documents with a single copy that is included in + the collection, provided that you follow the rules of this License for + verbatim copying of each of the documents in all other respects. + + You may extract a single document from such a collection, and distribute + it individually under this License, provided you insert a copy of this + License into the extracted document, and follow this License in all + other respects regarding verbatim copying of that document. + + + 7. AGGREGATION WITH INDEPENDENT WORKS + + A compilation of the Document or its derivatives with other separate + and independent documents or works, in or on a volume of a storage or + distribution medium, is called an "aggregate" if the copyright + resulting from the compilation is not used to limit the legal rights + of the compilation's users beyond what the individual works permit. + When the Document is included in an aggregate, this License does not + apply to the other works in the aggregate which are not themselves + derivative works of the Document. + + If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one half of + the entire aggregate, the Document's Cover Texts may be placed on + covers that bracket the Document within the aggregate, or the + electronic equivalent of covers if the Document is in electronic form. + Otherwise they must appear on printed covers that bracket the whole + aggregate. + + + 8. TRANSLATION + + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. + Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License, and all the license notices in the + Document, and any Warranty Disclaimers, provided that you also include + the original English version of this License and the original versions + of those notices and disclaimers. In case of a disagreement between + the translation and the original version of this License or a notice + or disclaimer, the original version will prevail. + + If a section in the Document is Entitled "Acknowledgements", + "Dedications", or "History", the requirement (section 4) to Preserve + its Title (section 1) will typically require changing the actual + title. + + + 9. TERMINATION + + You may not copy, modify, sublicense, or distribute the Document except + as expressly provided for under this License. Any other attempt to + copy, modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + + + 10. FUTURE REVISIONS OF THIS LICENSE + + The Free Software Foundation may publish new, revised versions + of the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + http://www.gnu.org/copyleft/. + + Each version of the License is given a distinguishing version number. + If the Document specifies that a particular numbered version of this + License "or any later version" applies to it, you have the option of + following the terms and conditions either of that specified version or + of any later version that has been published (not as a draft) by the + Free Software Foundation. If the Document does not specify a version + number of this License, you may choose any version ever published (not + as a draft) by the Free Software Foundation. + + + ADDENDUM: How to use this License for your documents + + To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled + "GNU Free Documentation License". + + If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, + replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + + If you have Invariant Sections without Cover Texts, or some other + combination of the three, merge those two alternatives to suit the + situation. + + If your document contains nontrivial examples of program code, we + recommend releasing these examples in parallel under your choice of + free software license, such as the GNU General Public License, + to permit their use in free software. --- kdebase-3.5.6.orig/debian/libkonq4.install +++ kdebase-3.5.6/debian/libkonq4.install @@ -0,0 +1,16 @@ +debian/tmp/usr/lib/kde3/kded_favicons.la +debian/tmp/usr/lib/kde3/kded_favicons.so +debian/tmp/usr/lib/kde3/konq_sound.la +debian/tmp/usr/lib/kde3/konq_sound.so +debian/tmp/usr/lib/libkonq.so.4 +debian/tmp/usr/lib/libkonq.so.4.2.0 +debian/tmp/usr/share/apps/kbookmark/directory_bookmarkbar.desktop +debian/tmp/usr/share/apps/kconf_update/favicons.upd +debian/tmp/usr/share/apps/kconf_update/move_favicons.sh +debian/tmp/usr/share/apps/konqueror/pics/arrow_bottomleft.png +debian/tmp/usr/share/apps/konqueror/pics/arrow_bottomright.png +debian/tmp/usr/share/apps/konqueror/pics/arrow_topleft.png +debian/tmp/usr/share/apps/konqueror/pics/arrow_topright.png +debian/tmp/usr/share/apps/konqueror/pics/thumbnailfont_7x4.png +debian/tmp/usr/share/services/kded/favicons.desktop +debian/tmp/usr/share/servicetypes/konqpopupmenuplugin.desktop --- kdebase-3.5.6.orig/debian/konqueror.rc +++ kdebase-3.5.6/debian/konqueror.rc @@ -0,0 +1,100 @@ + + + + + + &Location + + + + + + + + + + + + + + + + &Edit + + + + + + + + + + + &View + + + + + + + + &Tools + + + + + &Settings + + + + + + + + + + + + + &Help + + + + + + + + Location Toolbar + + + + + + + + + + + + + + + Bookmark Toolbar + + + + + + --- kdebase-3.5.6.orig/debian/konqueror.prerm +++ kdebase-3.5.6/debian/konqueror.prerm @@ -0,0 +1,22 @@ +#! /bin/sh -e + +case "$1" in + remove) + /usr/sbin/update-alternatives --remove x-www-browser /usr/bin/konqueror + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/kdm.postrm +++ kdebase-3.5.6/debian/kdm.postrm @@ -0,0 +1,38 @@ +#! /bin/sh -e + +case "$1" in + purge) + rm -rf /var/log/kdm.log* + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then + # roll back displacement of default display manager file + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "rolling back change of default X display manager" + mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE" + fi +fi + +if [ "$1" = "purge" ]; then + for DIR in /var/lib/kdm; do + if [ -d "$DIR" ]; then + rm -rf "$DIR" + fi + done + rm -f /var/log/kdm.log* +fi + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/ksmserver.manpages +++ kdebase-3.5.6/debian/ksmserver.manpages @@ -0,0 +1 @@ +debian/man/startkde.1 --- kdebase-3.5.6.orig/debian/konqueror.mime +++ kdebase-3.5.6/debian/konqueror.mime @@ -0,0 +1,12 @@ +application/pdf; konqueror %s; nametemplate=%s.pdf; test=test "$DISPLAY" != "" && expr `gs --version` ">=" 3.51 >/dev/null 2>&1; priority=5 +application/postscript; konqueror %s; nametemplate=%s.ps; test=test "$DISPLAY" != "" && expr `gs --version` ">=" 3.51 >/dev/null 2>&1; priority=5 +image/gif; konqueror %s; nametemplate=%s.gif; test=test "$DISPLAY" != ""; priority=5 +image/jpeg; konqueror %s; nametemplate=%s.jpg; test=test "$DISPLAY" != ""; priority=5 +image/pjpeg; konqueror %s; nametemplate=%s.jpg; test=test "$DISPLAY" != ""; priority=5 +image/png; konqueror %s; nametemplate=%s.png; test=test "$DISPLAY" != ""; priority=5 +image/tiff; konqueror %s; nametemplate=%s.tiff; test=test "$DISPLAY" != ""; priority=5 +image/x-jng; konqueror %s; nametemplate=%s.jng; test=test "$DISPLAY" != ""; priority=5 +image/x-xbm; konqueror %s; nametemplate=%s.xbm; test=test "$DISPLAY" != ""; priority=5 +text/html; konqueror %s; nametemplate=%s.html; test=test "$DISPLAY" != ""; priority=5 +text/plain; konqueror %s; nametemplate=%s.txt; test=test "$DISPLAY" != ""; priority=5 +video/x-mng; konqueror %s; nametemplate=%s.mng; test=test "$DISPLAY" != ""; priority=5 --- kdebase-3.5.6.orig/debian/po/POTFILES.in +++ kdebase-3.5.6/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] kdm.templates --- kdebase-3.5.6.orig/debian/po/tr.po +++ kdebase-3.5.6/debian/po/tr.po @@ -0,0 +1,78 @@ +# Turkish translation of kdebase. +# This file is distributed under the same license as the kdebase package. +# Recai OktaÅŸ , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2004-05-10 18:07+0300\n" +"Last-Translator: Recai OktaÅŸ \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Kullanmak istediÄŸiniz öntanımlı ekran yöneticisini seçin." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Ekran yöneticisi, X Window Sistemi'ne grafik arayüz ile giriÅŸ yapmayı saÄŸlar." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Sadece bir ekran yöneticisi verilen X sunucusunu yönetebilir, ancak birden " +"fazla ekran yöneticisi kurulu durumda. Lütfen, öntanımlı olarak çalıştırmak " +"istediÄŸiniz ekran yöneticisini seçin." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(EÄŸer farklı sunucuları çalıştırmak için ayarlanırsa birden fazla ekran " +"yöneticisi kullanılabilir. Bunun için /etc/init.d içindeki ilgili betikleri " +"deÄŸiÅŸtirin ve öntanımlı ekran yöneticisini denetleyen iÅŸlevleri devre dışı " +"bırakın.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "kdm servisini durdurmak istiyor musunuz?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " +"oturumunu yönetiyor. EÄŸer kdm ÅŸimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette bırakabilirsiniz. " +"Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında etkin olacaktır." --- kdebase-3.5.6.orig/debian/po/fr.po +++ kdebase-3.5.6/debian/po/fr.po @@ -0,0 +1,88 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase 4:3.1.4-1\n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2003-12-21 10:56+0100\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Choisissez le gestionnaire graphique de session :" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Un gestionnaire graphique de session est un programme qui permet de se " +"connecter à la machine depuis le système « X Window »." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +" Un seul gestionnaire graphique de session peut s'occuper d'un serveur X " +"donné, mais plusieurs gestionnaires sont installés. Veuillez sélectionner " +"celui qui sera utilisé par défaut." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"Plusieurs gestionnaires graphiques peuvent fonctionner en même temps, s'ils " +"gèrent des serveurs X différents ; pour cela, configurez correctement chacun " +"des gestionnaires graphiques, modifiez leurs scripts de lancement dans /etc/" +"init.d, et enlevez le test de gestionnaire graphique par défaut." + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Faut-il arrêter le démon kdm ?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Le démon kdm (« K Desktop manager ») est usuellement arrêté lors de la mise à " +"jour ou de la suppression du paquet. Cependant, il semble gèrer " +"actuellement au moins une session X. Si kdm est arrêté maintenant, toutes " +"les sessions X qu'il gère seront arrêtées. Si vous préférez, vous pouvez le " +"laisser fonctionner : la nouvelle version sera prise en compte au " +"prochain redémarrage du démon." --- kdebase-3.5.6.orig/debian/po/da.po +++ kdebase-3.5.6/debian/po/da.po @@ -0,0 +1,92 @@ +# translation of kdebase_4:3.1.5-2_templates.po to Danish +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Claus Hindsgaul , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase_4:3.1.5-2_templates\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2004-09-28 13:48+0200\n" +"Last-Translator: Claus Hindsgaul \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Vælg den ønskede standard logind-håndtering." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"En logind-håndtering er et program, der giver mulighed for grafisk logind " +"under X-Windowsystemet." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"En given X-server kan kun håndteres af én logind-håndtering, men der er " +"installeret flere logind-håndteringspakker. Vælg den logind-håndtering, der " +"som udgangspunkt skal køres." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Flere logind-håndteringer kan godt køre samtidig, hvis de er sat op til at " +"håndtere forskellige servere. For at opnå dette, skal du sætte " +"logind-håndteringerne op til det, ved at redigere deres respektive skripter " +"i /etc/init.d, hvor du skal deaktivere tjekket for en " +"standard-logindhåndtering.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Ønsker du at stoppe kdm-dæmonen?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Skrivebordshåndterings-dæmonen kdm stoppes typisk ved opgradering og fjernelse " +"af pakken, men den lader til at være beskæftiget med mindst én kørends " +"X-session. Hvis kdm stoppes nu, vil de X-sessioner, den håndterer, blive " +"afsluttet. Ellers kan du lade kdm køre. Så vil den nye version først tage " +"over når dæmonen genstartes." + --- kdebase-3.5.6.orig/debian/po/ar.po +++ kdebase-3.5.6/debian/po/ar.po @@ -0,0 +1,81 @@ +# translation of ar.po to Arabic +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Ossama M. Khayat , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: ar\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2005-07-19 22:25+0300\n" +"Last-Translator: Ossama M. Khayat \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "اختيار مدير العرض الاÙتراضي المطلوب." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "مدير العرض هو برنامج يقدّم قدرات تسجيل الدخول الرسومي لنظام X Window." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "يمكن لمدير عرض واحد Ùقط إدارة خادم X معيّن، ولكن هناك عدة حزم مدير عرض مثبّتة. الرجاء اختيار مدير العرض الذي يجب تشغيل بشكل اÙتراضي." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "(يمكن تشغيل عدة مدراء عرض بنÙس الوقت إن كانو مهيئين لإدارة خوادم مختلÙØ©Ø› لتنÙيذ هذا، قم بتهيئة مدراء العرض ÙˆÙقاً لذلك، بتعديل كل من نصوص init ÙÙŠ /etc/init.dØŒ وتعطيل التحقق من مدير عرض اÙتراضي.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "هل تود إيقا٠تشغيل عÙريت kdmØŸ" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"يكون عÙريت مدير سطح مكتب كي (kdm) عادة موقÙاً عند ترقية الحزمة وإزالتها، " +"ولكن يبدو أنه يدير على الأقل جلسة X واحدة تعمل حالياً. " +"إن تم إيقا٠kdm الآن، Ùستنهى أي جلسات X يقوم بإدارتها. " +"عدى ذلك يمكنك ترك kdm يعمل، وسيسري Ù…Ùعول النسخة الجديدة ÙÙŠ المرة " +"التالية التي يتم Ùيها إعادة تشغيل العÙريت." + --- kdebase-3.5.6.orig/debian/po/ro.po +++ kdebase-3.5.6/debian/po/ro.po @@ -0,0 +1,79 @@ +# Romanian translation of kdebase_4. +# Copyright (C) 2006 THE kdebase_4'S COPYRIGHT HOLDER +# This file is distributed under the same license as the kdebase_4 package. +# mutulica , 2006. +# , fuzzy +# mutulica , 2006. +# +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase_4 3.5.4-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-09 12:46-0600\n" +"PO-Revision-Date: 2006-09-15 01:01+0300\n" +"Last-Translator: Stan Ioan-Eugen \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Description +#: ../kdm.templates:1001 +msgid "Select the desired default display manager." +msgstr "AlegeÅ£i administratorul de ecran implicit, pe care îl doriÅ£i." + +#. Type: select +#. Description +#: ../kdm.templates:1001 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "Un administrator de ecran este un program ce oferă capabilităţi de autentificare " +"în mod grafic pentru Sistemul X Window." + +#. Type: select +#. Description +#: ../kdm.templates:1001 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "Doar un singur administrator de ecran poate administra un server X dat, dar sunt instalaÅ£i " +"mai mulÅ£i administratori. AlegeÅ£i care administrator de ecran să ruleze implicit." + +#. Type: select +#. Description +#: ../kdm.templates:1001 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "(Simultan pot rula mai mulÅ£i administratori de ecran dacă sunt configuraÅ£i să administreze " +"servere diferite; pentru a obÅ£ine acest lucru, configuraÅ£i administratorul de ecran pentru " +"această funcÅ£ie, editaÅ£i scripturile de iniÅ£iere din /etc/init.d, ÅŸi dezactivaÅ£i opÅ£iunea " +"de verificare a administratorului de ecran implicit.)" + +#. Type: boolean +#. Description +#: ../kdm.templates:3001 +msgid "Do you wish to stop the kdm daemon?" +msgstr "DoriÅ£i să opriÅ£i demonul kdm?" + +#. Type: boolean +#. Description +#: ../kdm.templates:3001 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea pachetului" +"ÅŸi la eliminarea sa, dar se pare că acum administrează o sesiune X de lucru." +"Dacă demonul kdm este oprit acum, orice sesiune X pe care o administrează " +"va fi oprită. O alternativă ar fi să lăsaÅ£i kdm să ruleze, iar noua versiune va rula" +"data viitoare când demonul va fi repornit." + --- kdebase-3.5.6.orig/debian/po/pl.po +++ kdebase-3.5.6/debian/po/pl.po @@ -0,0 +1,86 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2004-01-21 21:17+0100\n" +"Last-Translator: Marcin Owsiany \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Wybierz domy¶lny display manager." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Display manager to program, który umo¿liwia logowanie siê bezpo¶rednio do " +"systemu X Window." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Tylko jeden display manager mo¿e kontrolowaæ dany X serwer, ale " +"zainstalowanych jest obecnie kilka takich programów. Wybierz, który z nich ma " +"byæ uruchamiany domy¶lnie." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Mo¿na uruchomiæ kilka programów \"display manager\", ale musz± one kontrolowaæ " +"ró¿ne serwery; mo¿na to osi±gn±æ konfiguruj±c odpowiednio ka¿dy z nich i " +"wy³±czaj±c w ich skryptach startowych fragment sprawdzaj±cy domy¶lny display " +"manager.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Czy chcesz zatrzymaæ daemona kdm?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i usuwania pakietu kdm, ale wygl±da na to, ¿e w tej chwili zarz±dza on conajmniej jedn± sesj± X Window. Je¶li zostanie on teraz zatrzymany, wszystkie zarz±dzane przez niego sesje zostan± przerwane. Mo¿na jednak nie zatrzymywaæ teraz tego daemona -- nowa wersja zacznie dzia³aæ przy jego najbli¿szym restarcie." + --- kdebase-3.5.6.orig/debian/po/ja.po +++ kdebase-3.5.6/debian/po/ja.po @@ -0,0 +1,78 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2004-01-13 15:02+0900\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "ÍøÍѤ·¤¿¤¤¥Ç¥Õ¥©¥ë¥È¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ï¡¢X Window System ¤Ø¤Î¥°¥é¥Õ¥£¥«¥ë¥í¥°¥¤¥óµ¡Ç½¤òÄ󶡤¹¤ë¥×¥í¥°¥é¥à¤Ç¤¹¡£" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"1 ¤Ä¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤À¤±¤¬Í¿¤¨¤é¤ì¤¿ X ¥µ¡¼¥Ð¤ò´ÉÍý¤Ç¤­¤Þ¤¹¤¬¡¢Ê£¿ô¤Î¥Ç\n" +"¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¼Â¹Ô¤·¤¿¤¤¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Ê£¿ô¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Ï¡¢¤â¤·°Û¤Ê¤ë¥µ¡¼¥Ð¤ò´ÉÍý¤¹¤ë¤è¤¦ÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î\n" +"¤Ç¤¢¤ì¤ÐƱ»þ¤Ë¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¤³¤ì¤ò¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òŬÀÚ¤ËÀßÄꤷ¤Æ¡¢/etc/init.d ¤Ë¤¢¤ë³Æ init ¥¹¥¯¥ê¥×¥È¤òÊÔ½¸¤·¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤Î³Îǧ¤ò̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "kdm ¥Ç¡¼¥â¥ó¤òÄä»ß¤·¤¿¤¤¤Ç¤¹¤«?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "K Desktop manager (kdm) ¥Ç¡¼¥â¥ó¤ÏÄ̾¥Ñ¥Ã¥±¡¼¥¸¤Î¹¹¿·¤ª¤è¤Óºï½ü»þ¤ËÄä»ß¤·¤Þ¤¹¤¬¡¢¾¯¤Ê¤¯¤È¤â 1 ¤Ä¤ÎÆ°ºîÃæ¤Î X ¥»¥Ã¥·¥ç¥ó¤ò´ÉÍý¤·¤Æ¤¤¤ë¤è¤¦¤Ç¤¹¡£kdm ¤òº£Ää»ß¤¹¤ë¤È¡¢¤³¤ì¤¬´ÉÍý¤¹¤ë X ¥»¥Ã¥·¥ç¥ó¤Ï»¦¤µ¤ì¤Þ¤¹¡£¤½¤ÎÂå¤ï¤ê¤Ë¡¢kdm ¤òÆ°ºî¤·¤Æ¤¤¤ë¤Þ¤Þ¤Ë¤·¤Æ¤ª¤­¡¢¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ï¼¡²ó¤Î¥Ç¡¼¥â¥ó¤ÎºÆµ¯Æ°»þ¤Ë¸ú²Ì¤òɽ¤¹¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£" --- kdebase-3.5.6.orig/debian/po/templates.pot +++ kdebase-3.5.6/debian/po/templates.pot @@ -0,0 +1,75 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" --- kdebase-3.5.6.orig/debian/po/it.po +++ kdebase-3.5.6/debian/po/it.po @@ -0,0 +1,82 @@ +# kdebase po-debconf translation to Italian (it) +# Copyright (C) 2006 Software in the Public Interest +# This file is distributed under the same license as the kdebase package. +# Luca Monducci , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase 3.5.0 italian debconf templates\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-01-13 05:03-0700\n" +"PO-Revision-Date: 2006-01-22 10:58+0100\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Scelta del display manager predefinito." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Un display manager è un programma che permette di effettuare il login " +"grafico per X Window System." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Un server X può essere gestito da un solo display manager però è installato " +"più di un display manager. Scegliere il display manager che si preferisce " +"usare." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"Si possono eseguire più display manager simultaneamente solo se sono " +"configurati per gestire degli X server diversi; per farlo, configurare " +"opportunamente i display manager modificando i loro script di " +"inizializzazione in /etc/init.d e disattivando il controllo per il display " +"manager predefinito." + +#. Type: boolean +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Si vuole fermare il demone kdm?" + +#. Type: boolean +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Il demone kdm (K Desktop manager) viene normalmente fermato durante " +"l'aggiornamento o la rimozione del pacchetto, però sembra che stia gestendo " +"almeno una sessione X attiva. Se il demone kdm viene fermato adesso verrà " +"chiusa qualsiasi sessione X sotto la sua gestione. Si può anche lasciare " +"kdm in esecuzione ma la nuova versione non verrà usata solo dopo aver " +"riavviato il demone." --- kdebase-3.5.6.orig/debian/po/nl.po +++ kdebase-3.5.6/debian/po/nl.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase 4:3.3.1-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2004-12-02 17:48+0100\n" +"Last-Translator: Luk Claes \n" +"Language-Team: Debian l10n Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Selecteer de gewenste standaard weergavebeheerder." + +#. Type: select +#: ../kdm.templates:4 +msgid "A display manager is a program that provides graphical login capabilities for the X Window System." +msgstr "Een weergavebeheerder is een programma dat grafische login-mogelijkheden aanbiedt voor het X Window System." + +#. Type: select +#: ../kdm.templates:4 +msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." +msgstr "Er kan maar één weergavebeheerder een gegeven X-server beheren, maar er zijn meerdere weergavebeheerder-pakketten geïnstalleerd. Selecteer welke weergavebeheerder standaard moet worden uitgevoerd." + +#. Type: select +#: ../kdm.templates:4 +msgid "(Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager.)" +msgstr "(Er kunnen meerdere weergavebeheerders tegelijk worden uitgevoerd als ze geconfigureerd zijn om verschillende servers te beheren; om dit te bereiken, configureert u de weergavebeheerders op de gepaste wijze, bewerkt u hun startscripts in /etc/init.d en schakelt u de controle voor een standaard weergavebeheerder uit.)" + +#. Type: string +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Wilt u de kdm-achtergronddienst stoppen?" + +#. Type: string +#: ../kdm.templates:26 +msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session. If kdm is stopped now, any X sessions it manages will be terminated. Otherwise you may leave kdm running, and the new version will take effect the next time the daemon is restarted." +msgstr "De K Desktop manager (kdm) achtergronddienst wordt typisch gestopt bij pakketopwaarderingen en -verwijderingen, maar het blijkt minstens één actieve X-sessie te beheren. Als kdm nu wordt gestopt, dan zullen alle X-sessies die het beheert worden beëindigd. Anders kunt u kdm laten draaien en zal de nieuwe versie gebruikt worden wanneer de achtergronddienst de volgende keer wordt gestart." + --- kdebase-3.5.6.orig/debian/po/cs.po +++ kdebase-3.5.6/debian/po/cs.po @@ -0,0 +1,87 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2005-01-09 10:11+0100\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Vyberte implicitního správce obrazovky." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Správce obrazovky je program, který nabízí grafické pøihlá¹ení do systému X " +"Window." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Máte nainstalováno nìkolik správcù obrazovky, ale jen jeden mù¾e obsluhovat " +"daný X server. Vyberte, který správce se má spou¹tìt standardnì." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Více správcù obrazovky mù¾e bì¾et zároveò pouze pokud spravují rùzné " +"servery. Pro dosa¾ení takového nastavení je musíte správnì nakonfigurovat, " +"upravit jejich spou¹tìcí skripty v /etc/init.d a zakázat kontrolu " +"standardního správce obrazovky.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Chcete zastavit daemona kdm?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Daemon kdm (K Desktop manager) je obvykle pøi aktualizaci nebo odstranìní " +"balíku zastaven, ale zdá se, ¾e právì spravuje minimálnì jedno X sezení. " +"Pokud by byl kdm zastaven nyní, v¹echna jím spravovaná X sezení by byla " +"ukonèena. V opaèném pøípadì mù¾ene nechat kdm bì¾et a nová verze se spustí " +"s pøí¹tím restartem daemona." --- kdebase-3.5.6.orig/debian/po/vi.po +++ kdebase-3.5.6/debian/po/vi.po @@ -0,0 +1,66 @@ +# Vietnamese Translation for kdebase. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase 4/3.3.2-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2005-06-06 11:37+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#.Type: select +#.Description +#:../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Hãy chá»n trình quản lý trình bày đã muốn." + +#.Type: select +#.Description +#:../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "Má»™t trình quản lý trình bày là má»™t chÆ°Æ¡ng trình cung cấp khả năng đăng nhập đồ há»a cho hệ thống cá»­a sổ X." + +#.Type: select +#.Description +#:../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "Chỉ má»™t trình quản lý trình bày có thể quản lý má»™t trình phục vụ X nào đó, nhÆ°ng mà có cài đặt nhiá»u trình loại ấy rồi. Hãy chá»n chạy trình quản lý trình bày nào theo mặc định." + +#.Type: select +#.Description +#:../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "(Nhiá»u trình quản lý trình bày khác có thể chạy đồng thá»i nếu má»—i trình được cấu hình để quản lý má»™t trình phục vụ riêng. Äể làm nhÆ° thế, hãy cấu hình má»—i trình quản lý trình bày má»™t cách tÆ°Æ¡ng ứng, rồi sá»­a đổi má»—i tập lệnh «init» trong «/etc/init.d» từng má»™t cái, và vô hiệu hóa việc kiểm tra có má»™t trình quản lý trình bày mặc định." + +#.Type: string +#.Description +#:../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Bạn có muốn ngừng trình ná»n kdm không?" + +#.Type: string +#.Description +#:../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "Trình quản lý màn hình ná»n (K Desktop Manager: kdm) thÆ°á»ng bị ngừng khi nâng cấp và loại bá» gói tin, nhÆ°ng mà lúc này hình nhÆ° nó Ä‘ang quản lý ít nhất má»™t phiên làm việc X Ä‘ang chạy. Nếu kdm bị ngừng ngay bây giá», phiên X nào mà nó Ä‘ang quản lý thì sẽ bị kết thức. Nếu không, thì nó tiếp tục chạy, và phiên bản má»›i sẽ hoạt Ä‘á»™ng lúc khởi chạy lại trình ná»n ấy." --- kdebase-3.5.6.orig/debian/po/ru.po +++ kdebase-3.5.6/debian/po/ru.po @@ -0,0 +1,71 @@ +# translation of kdebase_4:3.5.2-2_ru.po to Russian +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Yuriy Talakan' , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase_4:3.5.2-2_ru\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-04-24 05:03-0600\n" +"PO-Revision-Date: 2006-05-14 21:47+1000\n" +"Last-Translator: Yuriy Talakan' \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Выберите желаемый оконный менеджер по умолчанию." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "Оконный менеджер Ñто программа, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¾Ð±ÐµÑпечивает возможноÑÑ‚ÑŒ графичеÑкого входа Ð´Ð»Ñ X Window System." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "Только один оконный менеджер может управлÑÑ‚ÑŒ заданным Ñервером X, но может быть уÑтановлено много пакетов оконных менеджеров. Выберите, какой оконный менеджер должен запуÑкатьÑÑ Ð¿Ð¾ умолчанию." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "(Много оконных менеджеров могут работать одновременно только в Ñлучае еÑли они наÑтроены на управление разными Ñерверами; чтобы добитьÑÑ Ñтого, наÑтройте оконные менеджеры ÑоответÑтвенно, отредактируйте каждый из их Ñтартовых Ñкриптов в /etc/init.d, и запретите проверку на оконный менеджер по умолчанию.)" + +#. Type: boolean +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Желаете оÑтановить демон kdm?" + +#. Type: boolean +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Демон K Desktop manager (kdm) обычно оÑтанавливаетÑÑ Ð¿Ñ€Ð¸ обновлении пакета и удалении, но похоже, что ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ð½ управлÑет как минимум одной активной X-ÑеÑÑией. " +"ЕÑли оÑтановить kdm ÑейчаÑ, то вÑе управлÑемые им X-ÑеÑÑии будут прерваны. " +"Либо вы можете оÑтавить kdm работать, и Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ активна позже, когда демон переÑтартует." + --- kdebase-3.5.6.orig/debian/po/de.po +++ kdebase-3.5.6/debian/po/de.po @@ -0,0 +1,91 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Erik Schanze , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase_4:3.2.3-1_templates\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2005-01-13 14:58+0100\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Wählen Sie den gewünschten Display-Manager aus." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Der Display-Manager ermöglicht das grafische Einloggen in das " +"X-Window-System." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Es können mehrere Display-Manager installiert sein, aber nur einer kann einen " +"übergebenen X-Server verwalten. Bitte wählen Sie den Display-Manager, der " +"standardmäßig gestartet werden soll." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Mehrere Display-Manager können gleichzeitig laufen, wenn sie so eingestellt " +"sind, dass sie verschiedene Server verwalten können; um das zu erreichen, " +"richten Sie die Display-Manager entsprechend ein, ändern Sie deren Init-Skripte " +"im Verzeichnis /etc/init.d und deaktivieren Sie den Test auf einen Standard-" +"Display-Manager.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Wollen Sie den kdm-Daemon anhalten?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Der K-Desktop-Manager-Daemon (kdm) wird normalerweise beim " +"Aktualisieren und Entfernen des Pakets angehalten, aber er verwaltet " +"scheinbar gerade eine laufende X-Sitzung. Wenn kdm jetzt angehalten wird, " +"werden alle X-Sitzungen, die er verwaltet, beendet. Sie können kdm auch " +"weiterlaufen lassen und die neue Version wird wirksam, wenn der Daemon das " +"nächste Mal neu gestartet wird." + --- kdebase-3.5.6.orig/debian/po/es.po +++ kdebase-3.5.6/debian/po/es.po @@ -0,0 +1,91 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Carlos Valdivia Yagüe +# +msgid "" +msgstr "" +"Project-Id-Version: kdm 3.1.4-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2003-12-22 15:35+0100\n" +"Last-Translator: Carlos Valdivia Yagüe \n" +"Language-Team: Debian L10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Escoja el gestor de sesiones predeterminado que desee." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Un gestor de sesiones es un programa que le ofrece la posibilidad de entrar " +"gráficamente en el sistema mediante el sistema X Window." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Cada servidor X sólo puede ser gestionado por un gestor de sesiones, pero " +"hay instalados varios paquetes de gestores de sesiones. Por favor, " +"seleccione qué gestor desea utilizar por defecto." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Se pueden ejecutar múltiples gestores de sesiones simultáneamente si se " +"configuran para gestionar distintos servidores; para conseguir esto, " +"configure los gestores de sesiones apropiadamente, edite cada uno de sus " +"guiones de inicio en /etc/init.d, y desactive la comprobación de un gestor " +"de sesiones predeterminado." + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "¿Quiere parar el demonio kdm?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"El demonio kdm (K Desktop Manager) normalmente se para al actualizar y " +"borrar el paquete, pero parece que está gestionando al menos una sesión " +"X activa. Si para kdm, cualquier sesión X que gestione será finalizada. " +"De lo contrario, puede dejar kdm ejecutándose y la nueva versión tendrá " +"efecto la próxima vez que se reinicie el demonio." --- kdebase-3.5.6.orig/debian/po/sv.po +++ kdebase-3.5.6/debian/po/sv.po @@ -0,0 +1,87 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase 4:3.4.2-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2005-10-14 20:23+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Välj den önskade standard fönsterhanteraren." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"En fönsterhanterare är ett program som ger möjlighet för grafiskt login till X Window System." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Bara en fönsterhanterare kan hantera en angiven X-server men paket för " +"multipla fönsterhanterare är installerad. Välj vilken fönsterhanterare som ska " +"köras som standard." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Multipla fönsterhanterare kan köras simultant om de är konfigurerade att hantera " +"olika servrar, för att göra detta, konfigurera fönsterhanterarna genom att ändra " +"respektives init-skript i /etc/init.d och stäng av kontrollen för standard fönsterhanterare.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Vill du stoppa kdm-daemonen?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Daemonen (kdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " +"och avinstallation av paketet men det verkar som om den hanterar åtminstone en " +"körande X-session. Om kdm stoppas nu kommer de X-sessioner den hanterar att " +"avslutas. Annars kan du lämna kdm körande och den nya versioner blir aktiverad " +"nästa gång daemonen startas om." +"" + --- kdebase-3.5.6.orig/debian/po/ca.po +++ kdebase-3.5.6/debian/po/ca.po @@ -0,0 +1,86 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: kdebase 3.1.5-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Seleccioneu el quadre gràfic d'entrada per defecte que desitgeu." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Un quadre gràfic d'entrada és un programa que proveeix de les capacitats " +"d'un quadre gràfic de connexió per al X Window System." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Un quadre gràfic d'entrada sols pot gestionar alhora un únic servidor X, " +"però podeu tindre instal·lats múltiples paquets de quadre gràfic d'entrada. " +"Si us plau, seleccioneu quin quadre gràfic d'entrada desitgeu que s'executi " +"per defecte." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Es poden executar múltiples quadres gràfics d'entrada simultàniament, però " +"sols si aquests estan configurats per a gestionar diferents servidors X; per " +"a fer això, configureu els quadres gràfics d'entrada conseqüentment, editeu " +"cadascun dels seus scripts d'arrencada en /etc/init.d i deshabiliteu la " +"comprovació per a un quadre gràfic d'entrada per defecte)." + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" --- kdebase-3.5.6.orig/debian/po/gl.po +++ kdebase-3.5.6/debian/po/gl.po @@ -0,0 +1,79 @@ +# debconf templates for kdebase +# This file is distributed under the same license as the kdebase package. +# Jacobo Tarrio , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: kdebase\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-03-30 05:02-0700\n" +"PO-Revision-Date: 2006-04-07 09:52+0200\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Escolla o xestor de pantalla por defecto que desexe." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Un xestor de pantalla é un programa que fornece capacidades de inicio de " +"sesión gráfico para o sistema X Window." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Só un xestor de pantalla pode xestionar un servidor X determinado, pero hai " +"varios paquetes de xestores de pantalla instalados. Escolla o que se debería " +"executar por defecto." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Pódense executar varios xestores de pantalla ao mesmo tempo se se " +"configuran para xestionar servidores distintos; para facelo, configure os " +"xestores de pantalla, edite os seus scripts de inicio de /etc/init.d e " +"desactive a comprobación do xestor de pantalla por defecto)." + +#. Type: boolean +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "¿Quere deter o daemon de kdm?" + +#. Type: boolean +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"Normalmente adóitase deter o daemon do xestor de pantalla de KDE (kdm) ao " +"actualizar ou eliminar o paquete, pero semella que está a xestionar alomenos " +"unha sesión X en execución. Se se detén kdm agora, hase cortar calquera " +"sesión X que xestione. Se non, pode deixar xdm a se executar, e a nova " +"versión ha tomar efecto a próxima vez que reinicie o daemon." --- kdebase-3.5.6.orig/debian/po/pt_BR.po +++ kdebase-3.5.6/debian/po/pt_BR.po @@ -0,0 +1,92 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: kdebase_3.1.4-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-12-18 03:24-0600\n" +"PO-Revision-Date: 2004-01-06 22:17-0300\n" +"Last-Translator: André Luís Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "Select the desired default display manager." +msgstr "Selecione o gerenciador de exibição padrão desejado." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"A display manager is a program that provides graphical login capabilities " +"for the X Window System." +msgstr "" +"Um gerenciador de exibição é um programa que fornece capacidades de " +"login gráficas para o Sistema de Janelas X." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"Only one display manager can manage a given X server, but multiple display " +"manager packages are installed. Please select which display manager should " +"run by default." +msgstr "" +"Somente um gerenciador de exibição pode gerenciar um dado servidor X, " +"mas diversos pacotes fornecendo gerenciadores de exibição estão " +"instalados. Por favor, selecione qual gerenciador de exibição deverá " +"ser executado por padrão." + +#. Type: select +#. Description +#: ../kdm.templates:4 +msgid "" +"(Multiple display managers can run simultaneously if they are configured to " +"manage different servers; to achieve this, configure the display managers " +"accordingly, edit each of their init scripts in /etc/init.d, and disable the " +"check for a default display manager.)" +msgstr "" +"(Diversos gerenciadores de exibição podem ser executados simultaneamente " +"caso sejam configurados para gerenciar diferentes servidores; para " +"fazê-lo, configure os gerenciadores de exibição de acordo, edite cada " +"um de seus scripts de inicialização no diretório /etc/init.d e " +"desabilite a checagem por um gerenciador de exibição padrão.)" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "Do you wish to stop the kdm daemon?" +msgstr "Deseja parar o daemon kdm ?" + +#. Type: string +#. Description +#: ../kdm.templates:26 +msgid "" +"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"and removal, but it appears to be managing at least one running X session. " +"If kdm is stopped now, any X sessions it manages will be terminated. " +"Otherwise you may leave kdm running, and the new version will take effect " +"the next time the daemon is restarted." +msgstr "" +"O daemon K Desktop Manager (kdm) é normalmente parado em atualizações ou " +"na remoção de seu pacote. No entanto, parece que o mesmo está gerenciando " +"pelo menos uma sessão X em execução. Caso o kdm seja parado agora, todas " +"as sessões X que o mesmo estiver gerenciando serão terminadas. Você pode " +"optar por deixar o kdm sendo executado e a nova versão do mesmo entrará " +"em ação na próxima vez que o daemon for reiniciado." --- kdebase-3.5.6.orig/debian/ksysguard.menu +++ kdebase-3.5.6/debian/ksysguard.menu @@ -0,0 +1,18 @@ +?package(ksysguard):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KDE System Guard"\ + icon32x32="/usr/share/pixmaps/ksysguard.xpm"\ + icon16x16="/usr/share/pixmaps/ksysguard-16.xpm"\ + command="/usr/bin/ksysguard" + +?package(ksysguard):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KDE System Guard - Process Table"\ + command="/usr/bin/kpm" + +# Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm +# Icon 16x16 ksysguard/cr16-app-ksysguard.png ksysguard-16.xpm --- kdebase-3.5.6.orig/debian/kdebase-doc.install +++ kdebase-3.5.6/debian/kdebase-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/kde/HTML/en/kdebase*-apidocs/* /usr/share/doc/kde/HTML/en/kdebase-apidocs --- kdebase-3.5.6.orig/debian/kdebase-data.install +++ kdebase-3.5.6/debian/kdebase-data.install @@ -0,0 +1,1720 @@ +debian/tmp/etc/kde3/kshorturifilterrc +debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu /etc/xdg/menus/kde-applications-merged/ +debian/tmp/etc/xdg/menus/kde-information.menu +debian/tmp/etc/xdg/menus/kde-screensavers.menu +debian/tmp/etc/xdg/menus/kde-settings.menu +debian/tmp/usr/share/applnk/.hidden/battery.desktop +debian/tmp/usr/share/applnk/.hidden/bwarning.desktop +debian/tmp/usr/share/applnk/.hidden/cwarning.desktop +debian/tmp/usr/share/applnk/.hidden/.directory +debian/tmp/usr/share/applnk/.hidden/email.desktop +debian/tmp/usr/share/applnk/.hidden/kcmkonq.desktop +debian/tmp/usr/share/applnk/.hidden/kcmkxmlrpcd.desktop +debian/tmp/usr/share/applnk/.hidden/konqhtml.desktop +debian/tmp/usr/share/applnk/.hidden/passwords.desktop +debian/tmp/usr/share/applnk/.hidden/power.desktop +debian/tmp/usr/share/applnk/.hidden/socks.desktop +debian/tmp/usr/share/applnk/.hidden/userinfo.desktop +debian/tmp/usr/share/applnk/.hidden/virtualdesktops.desktop +debian/tmp/usr/share/apps/kaccess/eventsrc +debian/tmp/usr/share/apps/kcmcss/template.css +debian/tmp/usr/share/apps/kcminput/cursor_large_black.pcf.gz +debian/tmp/usr/share/apps/kcminput/cursor_large_white.pcf.gz +debian/tmp/usr/share/apps/kcminput/cursor_small_white.pcf.gz +debian/tmp/usr/share/apps/kcminput/pics/mouse_lh.png +debian/tmp/usr/share/apps/kcminput/pics/mouse_rh.png +debian/tmp/usr/share/apps/kcmkeys/kde3.kksrc +debian/tmp/usr/share/apps/kcmkeys/kde4.kksrc +debian/tmp/usr/share/apps/kcmkeys/mac4.kksrc +debian/tmp/usr/share/apps/kcmkeys/unix3.kksrc +debian/tmp/usr/share/apps/kcmkeys/win3.kksrc +debian/tmp/usr/share/apps/kcmkeys/win4.kksrc +debian/tmp/usr/share/apps/kcmkeys/wm3.kksrc +debian/tmp/usr/share/apps/kcmlocale/pics/background.png +debian/tmp/usr/share/apps/kconf_update/convertShortcuts.pl +debian/tmp/usr/share/apps/kconf_update/kaccel.upd +debian/tmp/usr/share/apps/kconf_update/kcmdisplayrc.upd +debian/tmp/usr/share/apps/kconf_update/kuriikwsfilter.upd +debian/tmp/usr/share/apps/kconf_update/mouse_cursor_theme.upd +debian/tmp/usr/share/apps/kconf_update/socks.upd +debian/tmp/usr/share/apps/kcontrol/about/kcontrol.css +debian/tmp/usr/share/apps/kcontrol/about/main.html +debian/tmp/usr/share/apps/kcontrol/about/top-right-kcontrol.png +debian/tmp/usr/share/apps/kcontrol/kcontrolui.rc +debian/tmp/usr/share/apps/kcontrol/pics/energybig.png +debian/tmp/usr/share/apps/kcontrol/pics/lo-energy.png +debian/tmp/usr/share/apps/kcontrol/pics/logo.png +debian/tmp/usr/share/apps/kcontrol/pics/mini-world.png +debian/tmp/usr/share/apps/kcontrol/pics/monitor.png +debian/tmp/usr/share/apps/kcontrol/pics/onlyone.png +debian/tmp/usr/share/apps/kcontrol/pics/overlapping.png +debian/tmp/usr/share/apps/kcontrol/pics/play.png +debian/tmp/usr/share/apps/kdisplay/app-defaults/AAAAAAGeneral.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/AAAMotif.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/AAATk.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/AAAXaw.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/AcroRead.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/Editres.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/Emacs.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/GV.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/ML.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/Nedit.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/Netscape.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/RVPlayer.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/WPerfect.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/Xawtv.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/XCalc.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/Xdvi.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/XOsview.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/Xpdf.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/XTerm.ad +debian/tmp/usr/share/apps/kdisplay/app-defaults/XV.ad +debian/tmp/usr/share/apps/kdisplay/color-schemes/AtlasGreen.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/BeOS.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/BlackOnWhite.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/BlueSlate.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/CDE.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/DarkBlue.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/DesertRed.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/DigitalCDE.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/EveX.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/KDEOne.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/KDETwo.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/KeramikEmerald.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/Keramik.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/KeramikWhite.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/MediaPeach.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/Next.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/PaleGray.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/Plastik.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/PointReyesGreen.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/Pumpkin.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/SolarisCDE.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/Storm.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/System.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/WhiteOnBlack.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/Windows2000.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/Windows95.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/WindowsXP.kcsrc +debian/tmp/usr/share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc +debian/tmp/usr/share/apps/kfontview/kfontviewpart.rc +debian/tmp/usr/share/apps/kfontview/kfontviewui.rc +debian/tmp/usr/share/apps/kinfocenter/kinfocenterui.rc +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml +debian/tmp/usr/share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml +debian/tmp/usr/share/apps/kthememanager/themes/Keramik/Keramik.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/Keramik/Keramik.xml +debian/tmp/usr/share/apps/kthememanager/themes/Plastik/Plastik.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/Plastik/Plastik.xml +debian/tmp/usr/share/apps/kthememanager/themes/Platinum/Platinum.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/Platinum/Platinum.xml +debian/tmp/usr/share/apps/kthememanager/themes/Redmond/Redmond.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/Redmond/Redmond.xml +debian/tmp/usr/share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/Sunshine/Sunshine.xml +debian/tmp/usr/share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml +debian/tmp/usr/share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png +debian/tmp/usr/share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml +debian/tmp/usr/share/desktop-directories/kde-games-kids.directory +debian/tmp/usr/share/desktop-directories/kde-development.directory +debian/tmp/usr/share/desktop-directories/kde-development-translation.directory +debian/tmp/usr/share/desktop-directories/kde-development-webdevelopment.directory +debian/tmp/usr/share/desktop-directories/kde-editors.directory +debian/tmp/usr/share/desktop-directories/kde-edutainment.directory +debian/tmp/usr/share/desktop-directories/kde-games-arcade.directory +debian/tmp/usr/share/desktop-directories/kde-games-board.directory +debian/tmp/usr/share/desktop-directories/kde-games-card.directory +debian/tmp/usr/share/desktop-directories/kde-games.directory +debian/tmp/usr/share/desktop-directories/kde-games-roguelikes.directory +debian/tmp/usr/share/desktop-directories/kde-games-strategy.directory +debian/tmp/usr/share/desktop-directories/kde-graphics.directory +debian/tmp/usr/share/desktop-directories/kde-information.directory +debian/tmp/usr/share/desktop-directories/kde-internet.directory +debian/tmp/usr/share/desktop-directories/kde-internet-terminal.directory +debian/tmp/usr/share/desktop-directories/kde-main.directory +debian/tmp/usr/share/desktop-directories/kde-more.directory +debian/tmp/usr/share/desktop-directories/kde-multimedia.directory +debian/tmp/usr/share/desktop-directories/kde-office.directory +debian/tmp/usr/share/desktop-directories/kde-science.directory +debian/tmp/usr/share/desktop-directories/kde-settings-accessibility.directory +debian/tmp/usr/share/desktop-directories/kde-settings-components.directory +debian/tmp/usr/share/desktop-directories/kde-settings-desktop.directory +debian/tmp/usr/share/desktop-directories/kde-settings.directory +debian/tmp/usr/share/desktop-directories/kde-settings-hardware.directory +debian/tmp/usr/share/desktop-directories/kde-settings-looknfeel.directory +debian/tmp/usr/share/desktop-directories/kde-settingsmenu.directory +debian/tmp/usr/share/desktop-directories/kde-settings-network.directory +debian/tmp/usr/share/desktop-directories/kde-settings-peripherals.directory +debian/tmp/usr/share/desktop-directories/kde-settings-power.directory +debian/tmp/usr/share/desktop-directories/kde-settings-security.directory +debian/tmp/usr/share/desktop-directories/kde-settings-sound.directory +debian/tmp/usr/share/desktop-directories/kde-settings-system.directory +debian/tmp/usr/share/desktop-directories/kde-settings-webbrowsing.directory +debian/tmp/usr/share/desktop-directories/kde-system.directory +debian/tmp/usr/share/desktop-directories/kde-system-screensavers.directory +debian/tmp/usr/share/desktop-directories/kde-system-terminal.directory +debian/tmp/usr/share/desktop-directories/kde-toys.directory +debian/tmp/usr/share/desktop-directories/kde-unknown.directory +debian/tmp/usr/share/desktop-directories/kde-utilities-accessibility.directory +debian/tmp/usr/share/desktop-directories/kde-utilities-desktop.directory +debian/tmp/usr/share/desktop-directories/kde-utilities.directory +debian/tmp/usr/share/desktop-directories/kde-utilities-file.directory +debian/tmp/usr/share/desktop-directories/kde-utilities-peripherals.directory +debian/tmp/usr/share/desktop-directories/kde-utilities-pim.directory +debian/tmp/usr/share/desktop-directories/kde-utilities-xutils.directory +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/arts/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/arts/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/arts/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/arts/midi.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/background/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/background/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/background/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/bell/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/bell/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/bell/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/cache/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/cache/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/cache/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/clock/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/clock/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/clock/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/colors/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/colors/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/colors/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/cookies/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/cookies/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/cookies/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/crypto/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/crypto/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/crypto/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/desktopbehavior/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/desktopbehavior/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/desktop/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/desktop/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/desktop/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/ebrowsing/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/ebrowsing/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/ebrowsing/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/email/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/email/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/email/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/energy/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/energy/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/energy/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filemanager/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filemanager/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filemanager/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filemanager/kfileman1.png +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filemanager/kfileman2.png +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filetypes/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filetypes/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/filetypes/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/fonts/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/fonts/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/fonts/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/helpindex.html/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/helpindex.html/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/helpindex.html/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/icons/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/icons/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/icons/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmaccess/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmaccess/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmaccess/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmcss/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmcss/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmcss/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmfontinst/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmfontinst/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlaunch/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmnotify/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmnotify/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmnotify/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmsmserver/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmsmserver/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmsmserver/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmstyle/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kdm/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kdm/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kdm/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/keyboard/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/keyboard/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/keys/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/keys/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/keys/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/khtml/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kwindecoration/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/language/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/language/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/mouse/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/mouse/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/mouse/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/netpref/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/netpref/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/netpref/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/panelappearance/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/panelappearance/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/panelappearance/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/panel/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/panel/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/panel/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/passwords/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/passwords/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/passwords/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/performance/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/performance/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/performance/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/proxy/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/proxy/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/proxy/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/proxy/socks.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/screensaver/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/screensaver/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/screensaver/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/screenshot.png +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/smb/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/smb/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/smb/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/spellchecking/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/spellchecking/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/spellchecking/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/useragent/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/useragent/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/useragent/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/windowmanagement/common +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/windowmanagement/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/cdinfo/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/cdinfo/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/devices/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/devices/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/devices/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/dma/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/dma/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/dma/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/interrupts/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/interrupts/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/interrupts/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/ioports/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/ioports/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/ioports/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/memory/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/memory/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/memory/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/nics/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/nics/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/nics/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/opengl/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/opengl/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/opengl/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/partitions/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/partitions/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/partitions/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/pci/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/pci/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/pci/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/pcmcia/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/pcmcia/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/processor/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/processor/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/processor/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/protocols/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/protocols/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/protocols/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/samba/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/samba/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/samba/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/scsi/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/scsi/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/scsi/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/sound/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/sound/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/sound/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/usb/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/usb/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/usb/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/xserver/common +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/xserver/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/xserver/index.docbook +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/access.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/acroread.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/applixware.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/arts.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/background.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/bell.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/cache.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/clanbomber.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/clock.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/colors.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/date.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/email.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/energy.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/energy_star.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/filetypes.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/fonts.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/gimp.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/help_index.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/hwinfo.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kcmdevices.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kcmdf.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kcmkwm.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kcmmemory.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kcmpartitions.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kcmpci.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kcontrol.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kdmconfig.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/key_bindings.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kfm_home.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kscreensaver.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kthememgr.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/licq.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/linuxconf.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/locale.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/looknfeel.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/multimedia.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/netscape.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_applications.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_development.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_favourite.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_games.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_multimedia.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_network.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_settings.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_toys.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/package_utilities.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/penguin.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/personal.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/phppg.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/proxy.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/pysol.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/randr.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/samba.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/staroffice.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/stylesheet.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/terminal.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/tux.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/wp.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/xclock.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/xfmail.png +debian/tmp/usr/share/icons/crystalsvg/128x128/apps/xmag.png +debian/tmp/usr/share/icons/crystalsvg/128x128/devices/laptop.png +debian/tmp/usr/share/icons/crystalsvg/16x16/actions/newfont.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/abiword.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/access.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/acroread.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/agent.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/alevt.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/applixware.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/arts.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/assistant.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/background.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/bell.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/blender.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/bluefish.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/cache.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/clanbomber.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/clock.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/colors.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/cookie.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/date.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/designer.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/dia.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/dlgedit.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/eclipse.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/edu_languages.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/edu_mathematics.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/edu_science.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/emacs.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/email.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/energy.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/energy_star.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/enhanced_browsing.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/evolution.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/fifteenpieces.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/filetypes.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/fonts.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gabber.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gaim.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gimp.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gnome_apps.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gnomemeeting.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gnucash.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gnumeric.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gvim.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gv.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/help_index.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/hwinfo.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/icons.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/iconthemes.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/ieee1394.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/input_devices_settings.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmdevices.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmkicker.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmkwm.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmmemory.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmmidi.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmpartitions.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmpci.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmprocessor.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmscsi.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmsound.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmsystem.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmx.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcontrol.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kdmconfig.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/key_bindings.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/keyboard_layout.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/keyboard.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kfm_home.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/knotify.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kscreensaver.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kthememgr.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kvirc.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/licq.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/linguist.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/linuxconf.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/locale.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/looknfeel.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/lyx.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/mathematica.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/multimedia.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/nedit.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/netscape.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/opera.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_application.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_applications.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_development.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_editors.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_edutainment.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_favourite.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_games_arcade.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_games_board.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_games_card.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_games.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_games_strategy.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_graphics.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_multimedia.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_network.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_settings.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_system.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_toys.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_utilities.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/package_wordprocessing.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/panel_settings.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/pan.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/penguin.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/personal.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/phppg.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/planner.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/plan.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/proxy.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/pybliographic.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/randr.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/realplayer.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/remote.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/samba.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/scribus.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/sodipodi.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/style.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/stylesheet.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/terminal.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/tux.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/usb.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/vnc.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/wabi.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/wine.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/wp.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xcalc.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xchat.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xclipboard.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xclock.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xconsole.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xedit.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xemacs.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xeyes.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xfig.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xfmail.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xload.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xmag.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xmms.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xosview.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xpaint.png +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/xv.png +debian/tmp/usr/share/icons/crystalsvg/16x16/devices/laptop.png +debian/tmp/usr/share/icons/crystalsvg/22x22/actions/newfont.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/access.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/agent.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/arts.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/background.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/bell.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/cache.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/colors.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/cookie.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/date.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/email.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/energy.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/enhanced_browsing.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/fifteenpieces.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/filetypes.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/fonts.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/hwinfo.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/icons.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/iconthemes.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/ieee1394.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kcmdevices.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kcmkicker.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kcmkwm.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kcmx.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kdmconfig.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/key_bindings.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/keyboard.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kscreensaver.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kthememgr.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kvirc.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/locale.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/nedit.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/package_development.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/personal.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/proxy.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/randr.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/samba.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/style.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/stylesheet.png +debian/tmp/usr/share/icons/crystalsvg/22x22/devices/laptop.png +debian/tmp/usr/share/icons/crystalsvg/32x32/actions/newfont.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/abiword.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/access.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/acroread.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/agent.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/alevt.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/applixware.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/arts.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/assistant.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/background.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/bell.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/blender.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/bluefish.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/cache.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/clanbomber.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/clock.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/colors.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/cookie.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/date.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/designer.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/dia.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/dlgedit.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/eclipse.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/edu_languages.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/edu_mathematics.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/edu_science.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/emacs.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/email.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/energy.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/energy_star.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/enhanced_browsing.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/evolution.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/fifteenpieces.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/filetypes.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/fonts.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gabber.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gaim.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/galeon.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gimp.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gnome_apps.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gnomemeeting.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gnucash.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gnumeric.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gvim.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gv.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/help_index.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/hwinfo.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/icons.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/iconthemes.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/ieee1394.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/input_devices_settings.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmdevices.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmkicker.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmkwm.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmmemory.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmmidi.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmpartitions.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmpci.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmprocessor.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmscsi.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmsound.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmsystem.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmx.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcontrol.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kdmconfig.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/key_bindings.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/keyboard_layout.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/keyboard.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kfm_home.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/knotify.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kscreensaver.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kthememgr.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kvirc.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/licq.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/linguist.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/linuxconf.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/locale.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/looknfeel.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/lyx.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/mathematica.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/multimedia.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/nedit.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/netscape.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/opera.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_applications.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_development.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_editors.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_edutainment.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_favourite.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_games_arcade.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_games_board.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_games_card.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_games.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_games_strategy.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_graphics.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_multimedia.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_network.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_settings.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_system.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_toys.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_utilities.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/package_wordprocessing.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/pan.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/penguin.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/personal.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/phppg.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/pinguin.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/planner.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/plan.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/proxy.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/pybliographic.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/pysol.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/randr.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/realplayer.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/samba.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/scribus.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/sodipodi.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/style.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/stylesheet.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/terminal.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/tux.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/usb.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/vnc.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/wabi.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/wine.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/wp.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xapp.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xawtv.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xcalc.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xchat.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xclipboard.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xclock.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xconsole.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xedit.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xemacs.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xeyes.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xfig.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xfmail.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xload.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xmag.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xmms.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xosview.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xpaint.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/x.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/xv.png +debian/tmp/usr/share/icons/crystalsvg/32x32/devices/laptop.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/abiword.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/access.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/acroread.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/agent.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/applixware.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/arts.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/background.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/bell.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/blender.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/bluefish.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/cache.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/clanbomber.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/clock.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/colors.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/cookie.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/date.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/designer.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/dia.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/eclipse.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/edu_languages.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/edu_mathematics.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/edu_science.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/emacs.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/email.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/energy.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/energy_star.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/enhanced_browsing.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/evolution.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/fifteenpieces.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/filetypes.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/fonts.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gabber.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gaim.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/galeon.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gimp.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gnome_apps.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gnomemeeting.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gnucash.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gnumeric.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/gvim.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/help_index.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/hwinfo.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/icons.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/iconthemes.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/ieee1394.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/input_devices_settings.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmdevices.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmdf.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmkwm.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmmemory.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmmidi.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmopengl.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmpartitions.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmpci.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmprocessor.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmscsi.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmsystem.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcmx.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kcontrol.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kdmconfig.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/key_bindings.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/keyboard_layout.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/keyboard.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kfm_home.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/knotify.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kscreensaver.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kthememgr.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kvirc.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/licq.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/linuxconf.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/locale.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/looknfeel.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/multimedia.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/nedit.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/netscape.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/opera.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_applications.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_development.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_editors.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_edutainment.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_favourite.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_games_arcade.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_games_board.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_games_card.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_games.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_games_strategy.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_graphics.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_multimedia.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_network.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_settings.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_system.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_toys.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_utilities.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/package_wordprocessing.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/pan.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/penguin.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/personal.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/phppg.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/planner.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/proxy.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/pysol.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/randr.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/remote.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/samba.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/scribus.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/sodipodi.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/staroffice.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/style.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/stylesheet.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/terminal.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/tux.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/usb.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/vnc.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/wine.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/wmaker_apps.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/wp.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/xchat.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/xclock.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/xedit.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/xemacs.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/xfmail.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/xmag.png +debian/tmp/usr/share/icons/crystalsvg/48x48/apps/xv.png +debian/tmp/usr/share/icons/crystalsvg/48x48/devices/laptop.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/access.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/acroread.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/applixware.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/arts.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/background.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/bell.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/cache.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/clanbomber.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/clock.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/colors.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/cookie.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/date.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/email.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/energy.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/energy_star.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/enhanced_browsing.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/filetypes.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/fonts.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/gimp.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/gvim.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/help_index.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/hwinfo.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/icons.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/ieee1394.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcmdevices.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcmdf.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcmkwm.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcmmemory.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcmpartitions.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcmpci.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcmx.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kcontrol.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kdmconfig.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/key_bindings.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kfm_home.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/knotify.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kscreensaver.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kthememgr.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kvirc.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/licq.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/linuxconf.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/locale.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/looknfeel.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/multimedia.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/nedit.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/netscape.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_applications.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_development.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_favourite.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_games.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_multimedia.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_network.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_settings.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_toys.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/package_utilities.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/penguin.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/personal.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/phppg.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/proxy.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/pysol.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/qtella.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/randr.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/samba.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/staroffice.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/style.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/stylesheet.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/terminal.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/tux.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/wp.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/xclock.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/xfmail.png +debian/tmp/usr/share/icons/crystalsvg/64x64/apps/xmag.png +debian/tmp/usr/share/icons/crystalsvg/64x64/devices/laptop.png +debian/tmp/usr/share/locale/l10n/ad/entry.desktop +debian/tmp/usr/share/locale/l10n/ad/flag.png +debian/tmp/usr/share/locale/l10n/ae/entry.desktop +debian/tmp/usr/share/locale/l10n/ae/flag.png +debian/tmp/usr/share/locale/l10n/af/entry.desktop +debian/tmp/usr/share/locale/l10n/af/flag.png +debian/tmp/usr/share/locale/l10n/ag/entry.desktop +debian/tmp/usr/share/locale/l10n/ag/flag.png +debian/tmp/usr/share/locale/l10n/ai/entry.desktop +debian/tmp/usr/share/locale/l10n/ai/flag.png +debian/tmp/usr/share/locale/l10n/al/entry.desktop +debian/tmp/usr/share/locale/l10n/al/flag.png +debian/tmp/usr/share/locale/l10n/am/entry.desktop +debian/tmp/usr/share/locale/l10n/am/flag.png +debian/tmp/usr/share/locale/l10n/an/entry.desktop +debian/tmp/usr/share/locale/l10n/an/flag.png +debian/tmp/usr/share/locale/l10n/ao/entry.desktop +debian/tmp/usr/share/locale/l10n/ao/flag.png +debian/tmp/usr/share/locale/l10n/ar/entry.desktop +debian/tmp/usr/share/locale/l10n/ar/flag.png +debian/tmp/usr/share/locale/l10n/as/entry.desktop +debian/tmp/usr/share/locale/l10n/as/flag.png +debian/tmp/usr/share/locale/l10n/at/entry.desktop +debian/tmp/usr/share/locale/l10n/at/flag.png +debian/tmp/usr/share/locale/l10n/au/entry.desktop +debian/tmp/usr/share/locale/l10n/au/flag.png +debian/tmp/usr/share/locale/l10n/aw/entry.desktop +debian/tmp/usr/share/locale/l10n/aw/flag.png +debian/tmp/usr/share/locale/l10n/ax/entry.desktop +debian/tmp/usr/share/locale/l10n/ax/flag.png +debian/tmp/usr/share/locale/l10n/az/entry.desktop +debian/tmp/usr/share/locale/l10n/az/flag.png +debian/tmp/usr/share/locale/l10n/ba/entry.desktop +debian/tmp/usr/share/locale/l10n/ba/flag.png +debian/tmp/usr/share/locale/l10n/bb/entry.desktop +debian/tmp/usr/share/locale/l10n/bb/flag.png +debian/tmp/usr/share/locale/l10n/bd/entry.desktop +debian/tmp/usr/share/locale/l10n/bd/flag.png +debian/tmp/usr/share/locale/l10n/be/entry.desktop +debian/tmp/usr/share/locale/l10n/be/flag.png +debian/tmp/usr/share/locale/l10n/bf/entry.desktop +debian/tmp/usr/share/locale/l10n/bf/flag.png +debian/tmp/usr/share/locale/l10n/bg/entry.desktop +debian/tmp/usr/share/locale/l10n/bg/flag.png +debian/tmp/usr/share/locale/l10n/bh/entry.desktop +debian/tmp/usr/share/locale/l10n/bh/flag.png +debian/tmp/usr/share/locale/l10n/bi/entry.desktop +debian/tmp/usr/share/locale/l10n/bi/flag.png +debian/tmp/usr/share/locale/l10n/bj/entry.desktop +debian/tmp/usr/share/locale/l10n/bj/flag.png +debian/tmp/usr/share/locale/l10n/bm/entry.desktop +debian/tmp/usr/share/locale/l10n/bm/flag.png +debian/tmp/usr/share/locale/l10n/bn/entry.desktop +debian/tmp/usr/share/locale/l10n/bn/flag.png +debian/tmp/usr/share/locale/l10n/bo/entry.desktop +debian/tmp/usr/share/locale/l10n/bo/flag.png +debian/tmp/usr/share/locale/l10n/br/entry.desktop +debian/tmp/usr/share/locale/l10n/br/flag.png +debian/tmp/usr/share/locale/l10n/bs/entry.desktop +debian/tmp/usr/share/locale/l10n/bs/flag.png +debian/tmp/usr/share/locale/l10n/bt/entry.desktop +debian/tmp/usr/share/locale/l10n/bt/flag.png +debian/tmp/usr/share/locale/l10n/bw/entry.desktop +debian/tmp/usr/share/locale/l10n/bw/flag.png +debian/tmp/usr/share/locale/l10n/by/entry.desktop +debian/tmp/usr/share/locale/l10n/by/flag.png +debian/tmp/usr/share/locale/l10n/bz/entry.desktop +debian/tmp/usr/share/locale/l10n/bz/flag.png +debian/tmp/usr/share/locale/l10n/ca/entry.desktop +debian/tmp/usr/share/locale/l10n/ca/flag.png +debian/tmp/usr/share/locale/l10n/caribbean.desktop +debian/tmp/usr/share/locale/l10n/cc/entry.desktop +debian/tmp/usr/share/locale/l10n/cc/flag.png +debian/tmp/usr/share/locale/l10n/cd/entry.desktop +debian/tmp/usr/share/locale/l10n/cd/flag.png +debian/tmp/usr/share/locale/l10n/centralafrica.desktop +debian/tmp/usr/share/locale/l10n/centralamerica.desktop +debian/tmp/usr/share/locale/l10n/centralasia.desktop +debian/tmp/usr/share/locale/l10n/centraleurope.desktop +debian/tmp/usr/share/locale/l10n/C/entry.desktop +debian/tmp/usr/share/locale/l10n/cf/entry.desktop +debian/tmp/usr/share/locale/l10n/cf/flag.png +debian/tmp/usr/share/locale/l10n/C/flag.png +debian/tmp/usr/share/locale/l10n/cg/entry.desktop +debian/tmp/usr/share/locale/l10n/cg/flag.png +debian/tmp/usr/share/locale/l10n/ch/entry.desktop +debian/tmp/usr/share/locale/l10n/ch/flag.png +debian/tmp/usr/share/locale/l10n/ci/entry.desktop +debian/tmp/usr/share/locale/l10n/ci/flag.png +debian/tmp/usr/share/locale/l10n/ck/entry.desktop +debian/tmp/usr/share/locale/l10n/ck/flag.png +debian/tmp/usr/share/locale/l10n/cl/entry.desktop +debian/tmp/usr/share/locale/l10n/cl/flag.png +debian/tmp/usr/share/locale/l10n/cm/entry.desktop +debian/tmp/usr/share/locale/l10n/cm/flag.png +debian/tmp/usr/share/locale/l10n/cn/entry.desktop +debian/tmp/usr/share/locale/l10n/cn/flag.png +debian/tmp/usr/share/locale/l10n/co/entry.desktop +debian/tmp/usr/share/locale/l10n/co/flag.png +debian/tmp/usr/share/locale/l10n/cr/entry.desktop +debian/tmp/usr/share/locale/l10n/cr/flag.png +debian/tmp/usr/share/locale/l10n/cu/entry.desktop +debian/tmp/usr/share/locale/l10n/cu/flag.png +debian/tmp/usr/share/locale/l10n/cv/entry.desktop +debian/tmp/usr/share/locale/l10n/cv/flag.png +debian/tmp/usr/share/locale/l10n/cx/entry.desktop +debian/tmp/usr/share/locale/l10n/cx/flag.png +debian/tmp/usr/share/locale/l10n/cy/entry.desktop +debian/tmp/usr/share/locale/l10n/cy/flag.png +debian/tmp/usr/share/locale/l10n/cz/entry.desktop +debian/tmp/usr/share/locale/l10n/cz/flag.png +debian/tmp/usr/share/locale/l10n/de/entry.desktop +debian/tmp/usr/share/locale/l10n/de/flag.png +debian/tmp/usr/share/locale/l10n/dj/entry.desktop +debian/tmp/usr/share/locale/l10n/dj/flag.png +debian/tmp/usr/share/locale/l10n/dk/entry.desktop +debian/tmp/usr/share/locale/l10n/dk/flag.png +debian/tmp/usr/share/locale/l10n/dm/entry.desktop +debian/tmp/usr/share/locale/l10n/dm/flag.png +debian/tmp/usr/share/locale/l10n/do/entry.desktop +debian/tmp/usr/share/locale/l10n/do/flag.png +debian/tmp/usr/share/locale/l10n/dz/entry.desktop +debian/tmp/usr/share/locale/l10n/dz/flag.png +debian/tmp/usr/share/locale/l10n/eastasia.desktop +debian/tmp/usr/share/locale/l10n/easteurope.desktop +debian/tmp/usr/share/locale/l10n/ec/entry.desktop +debian/tmp/usr/share/locale/l10n/ec/flag.png +debian/tmp/usr/share/locale/l10n/ee/entry.desktop +debian/tmp/usr/share/locale/l10n/ee/flag.png +debian/tmp/usr/share/locale/l10n/eg/entry.desktop +debian/tmp/usr/share/locale/l10n/eg/flag.png +debian/tmp/usr/share/locale/l10n/eh/entry.desktop +debian/tmp/usr/share/locale/l10n/eh/flag.png +debian/tmp/usr/share/locale/l10n/er/entry.desktop +debian/tmp/usr/share/locale/l10n/er/flag.png +debian/tmp/usr/share/locale/l10n/es/entry.desktop +debian/tmp/usr/share/locale/l10n/es/flag.png +debian/tmp/usr/share/locale/l10n/et/entry.desktop +debian/tmp/usr/share/locale/l10n/et/flag.png +debian/tmp/usr/share/locale/l10n/fi/entry.desktop +debian/tmp/usr/share/locale/l10n/fi/flag.png +debian/tmp/usr/share/locale/l10n/fj/entry.desktop +debian/tmp/usr/share/locale/l10n/fj/flag.png +debian/tmp/usr/share/locale/l10n/fk/entry.desktop +debian/tmp/usr/share/locale/l10n/fk/flag.png +debian/tmp/usr/share/locale/l10n/fm/entry.desktop +debian/tmp/usr/share/locale/l10n/fm/flag.png +debian/tmp/usr/share/locale/l10n/fo/entry.desktop +debian/tmp/usr/share/locale/l10n/fo/flag.png +debian/tmp/usr/share/locale/l10n/fr/entry.desktop +debian/tmp/usr/share/locale/l10n/fr/flag.png +debian/tmp/usr/share/locale/l10n/ga/entry.desktop +debian/tmp/usr/share/locale/l10n/ga/flag.png +debian/tmp/usr/share/locale/l10n/gb/entry.desktop +debian/tmp/usr/share/locale/l10n/gb/flag.png +debian/tmp/usr/share/locale/l10n/gd/entry.desktop +debian/tmp/usr/share/locale/l10n/gd/flag.png +debian/tmp/usr/share/locale/l10n/ge/entry.desktop +debian/tmp/usr/share/locale/l10n/ge/flag.png +debian/tmp/usr/share/locale/l10n/gh/entry.desktop +debian/tmp/usr/share/locale/l10n/gh/flag.png +debian/tmp/usr/share/locale/l10n/gi/entry.desktop +debian/tmp/usr/share/locale/l10n/gi/flag.png +debian/tmp/usr/share/locale/l10n/gl/entry.desktop +debian/tmp/usr/share/locale/l10n/gl/flag.png +debian/tmp/usr/share/locale/l10n/gm/entry.desktop +debian/tmp/usr/share/locale/l10n/gm/flag.png +debian/tmp/usr/share/locale/l10n/gn/entry.desktop +debian/tmp/usr/share/locale/l10n/gn/flag.png +debian/tmp/usr/share/locale/l10n/gp/entry.desktop +debian/tmp/usr/share/locale/l10n/gp/flag.png +debian/tmp/usr/share/locale/l10n/gq/entry.desktop +debian/tmp/usr/share/locale/l10n/gq/flag.png +debian/tmp/usr/share/locale/l10n/gr/entry.desktop +debian/tmp/usr/share/locale/l10n/gr/flag.png +debian/tmp/usr/share/locale/l10n/gt/entry.desktop +debian/tmp/usr/share/locale/l10n/gt/flag.png +debian/tmp/usr/share/locale/l10n/gu/entry.desktop +debian/tmp/usr/share/locale/l10n/gu/flag.png +debian/tmp/usr/share/locale/l10n/gw/entry.desktop +debian/tmp/usr/share/locale/l10n/gw/flag.png +debian/tmp/usr/share/locale/l10n/gy/entry.desktop +debian/tmp/usr/share/locale/l10n/gy/flag.png +debian/tmp/usr/share/locale/l10n/hk/entry.desktop +debian/tmp/usr/share/locale/l10n/hk/flag.png +debian/tmp/usr/share/locale/l10n/hn/entry.desktop +debian/tmp/usr/share/locale/l10n/hn/flag.png +debian/tmp/usr/share/locale/l10n/hr/entry.desktop +debian/tmp/usr/share/locale/l10n/hr/flag.png +debian/tmp/usr/share/locale/l10n/ht/entry.desktop +debian/tmp/usr/share/locale/l10n/ht/flag.png +debian/tmp/usr/share/locale/l10n/hu/entry.desktop +debian/tmp/usr/share/locale/l10n/hu/flag.png +debian/tmp/usr/share/locale/l10n/id/entry.desktop +debian/tmp/usr/share/locale/l10n/id/flag.png +debian/tmp/usr/share/locale/l10n/ie/entry.desktop +debian/tmp/usr/share/locale/l10n/ie/flag.png +debian/tmp/usr/share/locale/l10n/il/entry.desktop +debian/tmp/usr/share/locale/l10n/il/flag.png +debian/tmp/usr/share/locale/l10n/in/entry.desktop +debian/tmp/usr/share/locale/l10n/in/flag.png +debian/tmp/usr/share/locale/l10n/iq/entry.desktop +debian/tmp/usr/share/locale/l10n/iq/flag.png +debian/tmp/usr/share/locale/l10n/ir/entry.desktop +debian/tmp/usr/share/locale/l10n/ir/flag.png +debian/tmp/usr/share/locale/l10n/is/entry.desktop +debian/tmp/usr/share/locale/l10n/is/flag.png +debian/tmp/usr/share/locale/l10n/it/entry.desktop +debian/tmp/usr/share/locale/l10n/it/flag.png +debian/tmp/usr/share/locale/l10n/jm/entry.desktop +debian/tmp/usr/share/locale/l10n/jm/flag.png +debian/tmp/usr/share/locale/l10n/jo/entry.desktop +debian/tmp/usr/share/locale/l10n/jo/flag.png +debian/tmp/usr/share/locale/l10n/jp/entry.desktop +debian/tmp/usr/share/locale/l10n/jp/flag.png +debian/tmp/usr/share/locale/l10n/ke/entry.desktop +debian/tmp/usr/share/locale/l10n/ke/flag.png +debian/tmp/usr/share/locale/l10n/kg/entry.desktop +debian/tmp/usr/share/locale/l10n/kg/flag.png +debian/tmp/usr/share/locale/l10n/kh/entry.desktop +debian/tmp/usr/share/locale/l10n/kh/flag.png +debian/tmp/usr/share/locale/l10n/ki/entry.desktop +debian/tmp/usr/share/locale/l10n/ki/flag.png +debian/tmp/usr/share/locale/l10n/km/entry.desktop +debian/tmp/usr/share/locale/l10n/km/flag.png +debian/tmp/usr/share/locale/l10n/kn/entry.desktop +debian/tmp/usr/share/locale/l10n/kn/flag.png +debian/tmp/usr/share/locale/l10n/kp/entry.desktop +debian/tmp/usr/share/locale/l10n/kp/flag.png +debian/tmp/usr/share/locale/l10n/kr/entry.desktop +debian/tmp/usr/share/locale/l10n/kr/flag.png +debian/tmp/usr/share/locale/l10n/kw/entry.desktop +debian/tmp/usr/share/locale/l10n/kw/flag.png +debian/tmp/usr/share/locale/l10n/ky/entry.desktop +debian/tmp/usr/share/locale/l10n/ky/flag.png +debian/tmp/usr/share/locale/l10n/kz/entry.desktop +debian/tmp/usr/share/locale/l10n/kz/flag.png +debian/tmp/usr/share/locale/l10n/la/entry.desktop +debian/tmp/usr/share/locale/l10n/la/flag.png +debian/tmp/usr/share/locale/l10n/lb/entry.desktop +debian/tmp/usr/share/locale/l10n/lb/flag.png +debian/tmp/usr/share/locale/l10n/lc/entry.desktop +debian/tmp/usr/share/locale/l10n/lc/flag.png +debian/tmp/usr/share/locale/l10n/li/entry.desktop +debian/tmp/usr/share/locale/l10n/li/flag.png +debian/tmp/usr/share/locale/l10n/lk/entry.desktop +debian/tmp/usr/share/locale/l10n/lk/flag.png +debian/tmp/usr/share/locale/l10n/lr/entry.desktop +debian/tmp/usr/share/locale/l10n/lr/flag.png +debian/tmp/usr/share/locale/l10n/ls/entry.desktop +debian/tmp/usr/share/locale/l10n/ls/flag.png +debian/tmp/usr/share/locale/l10n/lt/entry.desktop +debian/tmp/usr/share/locale/l10n/lt/flag.png +debian/tmp/usr/share/locale/l10n/lu/entry.desktop +debian/tmp/usr/share/locale/l10n/lu/flag.png +debian/tmp/usr/share/locale/l10n/lv/entry.desktop +debian/tmp/usr/share/locale/l10n/lv/flag.png +debian/tmp/usr/share/locale/l10n/ly/entry.desktop +debian/tmp/usr/share/locale/l10n/ly/flag.png +debian/tmp/usr/share/locale/l10n/ma/entry.desktop +debian/tmp/usr/share/locale/l10n/ma/flag.png +debian/tmp/usr/share/locale/l10n/mc/entry.desktop +debian/tmp/usr/share/locale/l10n/mc/flag.png +debian/tmp/usr/share/locale/l10n/md/entry.desktop +debian/tmp/usr/share/locale/l10n/md/flag.png +debian/tmp/usr/share/locale/l10n/mg/entry.desktop +debian/tmp/usr/share/locale/l10n/mg/flag.png +debian/tmp/usr/share/locale/l10n/mh/entry.desktop +debian/tmp/usr/share/locale/l10n/mh/flag.png +debian/tmp/usr/share/locale/l10n/middleeast.desktop +debian/tmp/usr/share/locale/l10n/mk/entry.desktop +debian/tmp/usr/share/locale/l10n/mk/flag.png +debian/tmp/usr/share/locale/l10n/ml/entry.desktop +debian/tmp/usr/share/locale/l10n/ml/flag.png +debian/tmp/usr/share/locale/l10n/mm/entry.desktop +debian/tmp/usr/share/locale/l10n/mm/flag.png +debian/tmp/usr/share/locale/l10n/mn/entry.desktop +debian/tmp/usr/share/locale/l10n/mn/flag.png +debian/tmp/usr/share/locale/l10n/mo/entry.desktop +debian/tmp/usr/share/locale/l10n/mo/flag.png +debian/tmp/usr/share/locale/l10n/mq/entry.desktop +debian/tmp/usr/share/locale/l10n/mq/flag.png +debian/tmp/usr/share/locale/l10n/mr/entry.desktop +debian/tmp/usr/share/locale/l10n/mr/flag.png +debian/tmp/usr/share/locale/l10n/ms/entry.desktop +debian/tmp/usr/share/locale/l10n/ms/flag.png +debian/tmp/usr/share/locale/l10n/mt/entry.desktop +debian/tmp/usr/share/locale/l10n/mt/flag.png +debian/tmp/usr/share/locale/l10n/mu/entry.desktop +debian/tmp/usr/share/locale/l10n/mu/flag.png +debian/tmp/usr/share/locale/l10n/mv/entry.desktop +debian/tmp/usr/share/locale/l10n/mv/flag.png +debian/tmp/usr/share/locale/l10n/mw/entry.desktop +debian/tmp/usr/share/locale/l10n/mw/flag.png +debian/tmp/usr/share/locale/l10n/mx/entry.desktop +debian/tmp/usr/share/locale/l10n/mx/flag.png +debian/tmp/usr/share/locale/l10n/my/entry.desktop +debian/tmp/usr/share/locale/l10n/my/flag.png +debian/tmp/usr/share/locale/l10n/mz/entry.desktop +debian/tmp/usr/share/locale/l10n/mz/flag.png +debian/tmp/usr/share/locale/l10n/na/entry.desktop +debian/tmp/usr/share/locale/l10n/na/flag.png +debian/tmp/usr/share/locale/l10n/nc/entry.desktop +debian/tmp/usr/share/locale/l10n/nc/flag.png +debian/tmp/usr/share/locale/l10n/ne/entry.desktop +debian/tmp/usr/share/locale/l10n/ne/flag.png +debian/tmp/usr/share/locale/l10n/nf/entry.desktop +debian/tmp/usr/share/locale/l10n/nf/flag.png +debian/tmp/usr/share/locale/l10n/ng/entry.desktop +debian/tmp/usr/share/locale/l10n/ng/flag.png +debian/tmp/usr/share/locale/l10n/ni/entry.desktop +debian/tmp/usr/share/locale/l10n/ni/flag.png +debian/tmp/usr/share/locale/l10n/nl/entry.desktop +debian/tmp/usr/share/locale/l10n/nl/flag.png +debian/tmp/usr/share/locale/l10n/no/entry.desktop +debian/tmp/usr/share/locale/l10n/no/flag.png +debian/tmp/usr/share/locale/l10n/northafrica.desktop +debian/tmp/usr/share/locale/l10n/northamerica.desktop +debian/tmp/usr/share/locale/l10n/northeurope.desktop +debian/tmp/usr/share/locale/l10n/np/entry.desktop +debian/tmp/usr/share/locale/l10n/np/flag.png +debian/tmp/usr/share/locale/l10n/nr/entry.desktop +debian/tmp/usr/share/locale/l10n/nr/flag.png +debian/tmp/usr/share/locale/l10n/nu/entry.desktop +debian/tmp/usr/share/locale/l10n/nu/flag.png +debian/tmp/usr/share/locale/l10n/nz/entry.desktop +debian/tmp/usr/share/locale/l10n/nz/flag.png +debian/tmp/usr/share/locale/l10n/oceania.desktop +debian/tmp/usr/share/locale/l10n/om/entry.desktop +debian/tmp/usr/share/locale/l10n/om/flag.png +debian/tmp/usr/share/locale/l10n/pa/entry.desktop +debian/tmp/usr/share/locale/l10n/pa/flag.png +debian/tmp/usr/share/locale/l10n/pe/entry.desktop +debian/tmp/usr/share/locale/l10n/pe/flag.png +debian/tmp/usr/share/locale/l10n/pf/entry.desktop +debian/tmp/usr/share/locale/l10n/pf/flag.png +debian/tmp/usr/share/locale/l10n/pg/entry.desktop +debian/tmp/usr/share/locale/l10n/pg/flag.png +debian/tmp/usr/share/locale/l10n/ph/entry.desktop +debian/tmp/usr/share/locale/l10n/ph/flag.png +debian/tmp/usr/share/locale/l10n/pk/entry.desktop +debian/tmp/usr/share/locale/l10n/pk/flag.png +debian/tmp/usr/share/locale/l10n/pl/entry.desktop +debian/tmp/usr/share/locale/l10n/pl/flag.png +debian/tmp/usr/share/locale/l10n/pm/entry.desktop +debian/tmp/usr/share/locale/l10n/pm/flag.png +debian/tmp/usr/share/locale/l10n/pn/entry.desktop +debian/tmp/usr/share/locale/l10n/pn/flag.png +debian/tmp/usr/share/locale/l10n/pr/entry.desktop +debian/tmp/usr/share/locale/l10n/pr/flag.png +debian/tmp/usr/share/locale/l10n/ps/entry.desktop +debian/tmp/usr/share/locale/l10n/ps/flag.png +debian/tmp/usr/share/locale/l10n/pt/entry.desktop +debian/tmp/usr/share/locale/l10n/pt/flag.png +debian/tmp/usr/share/locale/l10n/pw/entry.desktop +debian/tmp/usr/share/locale/l10n/pw/flag.png +debian/tmp/usr/share/locale/l10n/py/entry.desktop +debian/tmp/usr/share/locale/l10n/py/flag.png +debian/tmp/usr/share/locale/l10n/qa/entry.desktop +debian/tmp/usr/share/locale/l10n/qa/flag.png +debian/tmp/usr/share/locale/l10n/ro/entry.desktop +debian/tmp/usr/share/locale/l10n/ro/flag.png +debian/tmp/usr/share/locale/l10n/ru/entry.desktop +debian/tmp/usr/share/locale/l10n/ru/flag.png +debian/tmp/usr/share/locale/l10n/rw/entry.desktop +debian/tmp/usr/share/locale/l10n/rw/flag.png +debian/tmp/usr/share/locale/l10n/sa/entry.desktop +debian/tmp/usr/share/locale/l10n/sa/flag.png +debian/tmp/usr/share/locale/l10n/sb/entry.desktop +debian/tmp/usr/share/locale/l10n/sb/flag.png +debian/tmp/usr/share/locale/l10n/sc/entry.desktop +debian/tmp/usr/share/locale/l10n/sc/flag.png +debian/tmp/usr/share/locale/l10n/sd/entry.desktop +debian/tmp/usr/share/locale/l10n/sd/flag.png +debian/tmp/usr/share/locale/l10n/se/entry.desktop +debian/tmp/usr/share/locale/l10n/se/flag.png +debian/tmp/usr/share/locale/l10n/sg/entry.desktop +debian/tmp/usr/share/locale/l10n/sg/flag.png +debian/tmp/usr/share/locale/l10n/sh/entry.desktop +debian/tmp/usr/share/locale/l10n/sh/flag.png +debian/tmp/usr/share/locale/l10n/si/entry.desktop +debian/tmp/usr/share/locale/l10n/si/flag.png +debian/tmp/usr/share/locale/l10n/sk/entry.desktop +debian/tmp/usr/share/locale/l10n/sk/flag.png +debian/tmp/usr/share/locale/l10n/sm/entry.desktop +debian/tmp/usr/share/locale/l10n/sm/flag.png +debian/tmp/usr/share/locale/l10n/sn/entry.desktop +debian/tmp/usr/share/locale/l10n/sn/flag.png +debian/tmp/usr/share/locale/l10n/so/entry.desktop +debian/tmp/usr/share/locale/l10n/so/flag.png +debian/tmp/usr/share/locale/l10n/southafrica.desktop +debian/tmp/usr/share/locale/l10n/southamerica.desktop +debian/tmp/usr/share/locale/l10n/southasia.desktop +debian/tmp/usr/share/locale/l10n/southeastasia.desktop +debian/tmp/usr/share/locale/l10n/southeurope.desktop +debian/tmp/usr/share/locale/l10n/sr/entry.desktop +debian/tmp/usr/share/locale/l10n/sr/flag.png +debian/tmp/usr/share/locale/l10n/st/entry.desktop +debian/tmp/usr/share/locale/l10n/st/flag.png +debian/tmp/usr/share/locale/l10n/sv/entry.desktop +debian/tmp/usr/share/locale/l10n/sv/flag.png +debian/tmp/usr/share/locale/l10n/sy/entry.desktop +debian/tmp/usr/share/locale/l10n/sy/flag.png +debian/tmp/usr/share/locale/l10n/sz/entry.desktop +debian/tmp/usr/share/locale/l10n/sz/flag.png +debian/tmp/usr/share/locale/l10n/tc/entry.desktop +debian/tmp/usr/share/locale/l10n/tc/flag.png +debian/tmp/usr/share/locale/l10n/td/entry.desktop +debian/tmp/usr/share/locale/l10n/td/flag.png +debian/tmp/usr/share/locale/l10n/tg/entry.desktop +debian/tmp/usr/share/locale/l10n/tg/flag.png +debian/tmp/usr/share/locale/l10n/th/entry.desktop +debian/tmp/usr/share/locale/l10n/th/flag.png +debian/tmp/usr/share/locale/l10n/tj/entry.desktop +debian/tmp/usr/share/locale/l10n/tj/flag.png +debian/tmp/usr/share/locale/l10n/tk/entry.desktop +debian/tmp/usr/share/locale/l10n/tk/flag.png +debian/tmp/usr/share/locale/l10n/tm/entry.desktop +debian/tmp/usr/share/locale/l10n/tm/flag.png +debian/tmp/usr/share/locale/l10n/tn/entry.desktop +debian/tmp/usr/share/locale/l10n/tn/flag.png +debian/tmp/usr/share/locale/l10n/to/entry.desktop +debian/tmp/usr/share/locale/l10n/to/flag.png +debian/tmp/usr/share/locale/l10n/tp/entry.desktop +debian/tmp/usr/share/locale/l10n/tp/flag.png +debian/tmp/usr/share/locale/l10n/tr/entry.desktop +debian/tmp/usr/share/locale/l10n/tr/flag.png +debian/tmp/usr/share/locale/l10n/tt/entry.desktop +debian/tmp/usr/share/locale/l10n/tt/flag.png +debian/tmp/usr/share/locale/l10n/tv/entry.desktop +debian/tmp/usr/share/locale/l10n/tv/flag.png +debian/tmp/usr/share/locale/l10n/tw/entry.desktop +debian/tmp/usr/share/locale/l10n/tw/flag.png +debian/tmp/usr/share/locale/l10n/tz/entry.desktop +debian/tmp/usr/share/locale/l10n/tz/flag.png +debian/tmp/usr/share/locale/l10n/ua/entry.desktop +debian/tmp/usr/share/locale/l10n/ua/flag.png +debian/tmp/usr/share/locale/l10n/ug/entry.desktop +debian/tmp/usr/share/locale/l10n/ug/flag.png +debian/tmp/usr/share/locale/l10n/us/entry.desktop +debian/tmp/usr/share/locale/l10n/us/flag.png +debian/tmp/usr/share/locale/l10n/uy/entry.desktop +debian/tmp/usr/share/locale/l10n/uy/flag.png +debian/tmp/usr/share/locale/l10n/uz/entry.desktop +debian/tmp/usr/share/locale/l10n/uz/flag.png +debian/tmp/usr/share/locale/l10n/va/entry.desktop +debian/tmp/usr/share/locale/l10n/va/flag.png +debian/tmp/usr/share/locale/l10n/vc/entry.desktop +debian/tmp/usr/share/locale/l10n/vc/flag.png +debian/tmp/usr/share/locale/l10n/ve/entry.desktop +debian/tmp/usr/share/locale/l10n/ve/flag.png +debian/tmp/usr/share/locale/l10n/vg/entry.desktop +debian/tmp/usr/share/locale/l10n/vg/flag.png +debian/tmp/usr/share/locale/l10n/vi/entry.desktop +debian/tmp/usr/share/locale/l10n/vi/flag.png +debian/tmp/usr/share/locale/l10n/vn/entry.desktop +debian/tmp/usr/share/locale/l10n/vn/flag.png +debian/tmp/usr/share/locale/l10n/vu/entry.desktop +debian/tmp/usr/share/locale/l10n/vu/flag.png +debian/tmp/usr/share/locale/l10n/westafrica.desktop +debian/tmp/usr/share/locale/l10n/westeurope.desktop +debian/tmp/usr/share/locale/l10n/wf/entry.desktop +debian/tmp/usr/share/locale/l10n/wf/flag.png +debian/tmp/usr/share/locale/l10n/ws/entry.desktop +debian/tmp/usr/share/locale/l10n/ws/flag.png +debian/tmp/usr/share/locale/l10n/ye/entry.desktop +debian/tmp/usr/share/locale/l10n/ye/flag.png +debian/tmp/usr/share/locale/l10n/yu/entry.desktop +debian/tmp/usr/share/locale/l10n/yu/flag.png +debian/tmp/usr/share/locale/l10n/za/entry.desktop +debian/tmp/usr/share/locale/l10n/za/flag.png +debian/tmp/usr/share/locale/l10n/zm/entry.desktop +debian/tmp/usr/share/locale/l10n/zm/flag.png +debian/tmp/usr/share/locale/l10n/zw/entry.desktop +debian/tmp/usr/share/locale/l10n/zw/flag.png +debian/tmp/usr/share/services/searchproviders/acronym.desktop +debian/tmp/usr/share/services/searchproviders/alexa.desktop +debian/tmp/usr/share/services/searchproviders/alexa_url.desktop +debian/tmp/usr/share/services/searchproviders/alltheweb.desktop +debian/tmp/usr/share/services/searchproviders/altavista.desktop +debian/tmp/usr/share/services/searchproviders/amg.desktop +debian/tmp/usr/share/services/searchproviders/appsy.desktop +debian/tmp/usr/share/services/searchproviders/austronaut.desktop +debian/tmp/usr/share/services/searchproviders/backports.desktop +debian/tmp/usr/share/services/searchproviders/bugft.desktop +debian/tmp/usr/share/services/searchproviders/bugno.desktop +debian/tmp/usr/share/services/searchproviders/call.desktop +debian/tmp/usr/share/services/searchproviders/cia.desktop +debian/tmp/usr/share/services/searchproviders/citeseer.desktop +debian/tmp/usr/share/services/searchproviders/cpan.desktop +debian/tmp/usr/share/services/searchproviders/ctan_cat.desktop +debian/tmp/usr/share/services/searchproviders/ctan.desktop +debian/tmp/usr/share/services/searchproviders/dbug.desktop +debian/tmp/usr/share/services/searchproviders/de2en.desktop +debian/tmp/usr/share/services/searchproviders/de2fr.desktop +debian/tmp/usr/share/services/searchproviders/deb.desktop +debian/tmp/usr/share/services/searchproviders/dmoz.desktop +debian/tmp/usr/share/services/searchproviders/docbook.desktop +debian/tmp/usr/share/services/searchproviders/doi.desktop +debian/tmp/usr/share/services/searchproviders/en2de.desktop +debian/tmp/usr/share/services/searchproviders/en2es.desktop +debian/tmp/usr/share/services/searchproviders/en2fr.desktop +debian/tmp/usr/share/services/searchproviders/en2it.desktop +debian/tmp/usr/share/services/searchproviders/es2en.desktop +debian/tmp/usr/share/services/searchproviders/excite.desktop +debian/tmp/usr/share/services/searchproviders/feedster.desktop +debian/tmp/usr/share/services/searchproviders/foldoc.desktop +debian/tmp/usr/share/services/searchproviders/fr2de.desktop +debian/tmp/usr/share/services/searchproviders/fr2en.desktop +debian/tmp/usr/share/services/searchproviders/freedb.desktop +debian/tmp/usr/share/services/searchproviders/freshmeat.desktop +debian/tmp/usr/share/services/searchproviders/froogle.desktop +debian/tmp/usr/share/services/searchproviders/fsd.desktop +debian/tmp/usr/share/services/searchproviders/google_advanced.desktop +debian/tmp/usr/share/services/searchproviders/google.desktop +debian/tmp/usr/share/services/searchproviders/google_groups.desktop +debian/tmp/usr/share/services/searchproviders/google_images.desktop +debian/tmp/usr/share/services/searchproviders/google_lucky.desktop +debian/tmp/usr/share/services/searchproviders/google_movie.desktop +debian/tmp/usr/share/services/searchproviders/google_news.desktop +debian/tmp/usr/share/services/searchproviders/gracenote.desktop +debian/tmp/usr/share/services/searchproviders/grec.desktop +debian/tmp/usr/share/services/searchproviders/hotbot.desktop +debian/tmp/usr/share/services/searchproviders/hyperdictionary.desktop +debian/tmp/usr/share/services/searchproviders/hyperdictionary_thesaurus.desktop +debian/tmp/usr/share/services/searchproviders/imdb.desktop +debian/tmp/usr/share/services/searchproviders/it2en.desktop +debian/tmp/usr/share/services/searchproviders/jeeves.desktop +debian/tmp/usr/share/services/searchproviders/katatudo.desktop +debian/tmp/usr/share/services/searchproviders/kde.desktop +debian/tmp/usr/share/services/searchproviders/kde_websvn.desktop +debian/tmp/usr/share/services/searchproviders/leo.desktop +debian/tmp/usr/share/services/searchproviders/lycos.desktop +debian/tmp/usr/share/services/searchproviders/mamma.desktop +debian/tmp/usr/share/services/searchproviders/metacrawler.desktop +debian/tmp/usr/share/services/searchproviders/msdn.desktop +debian/tmp/usr/share/services/searchproviders/netcraft.desktop +debian/tmp/usr/share/services/searchproviders/nl-telephone.desktop +debian/tmp/usr/share/services/searchproviders/nl-teletekst.desktop +debian/tmp/usr/share/services/searchproviders/pgpkeys.desktop +debian/tmp/usr/share/services/searchproviders/php.desktop +debian/tmp/usr/share/services/searchproviders/python.desktop +debian/tmp/usr/share/services/searchproviders/qt3.desktop +debian/tmp/usr/share/services/searchproviders/qt.desktop +debian/tmp/usr/share/services/searchproviders/rae.desktop +debian/tmp/usr/share/services/searchproviders/rfc.desktop +debian/tmp/usr/share/services/searchproviders/rpmfind.desktop +debian/tmp/usr/share/services/searchproviders/ruby_application_archive.desktop +debian/tmp/usr/share/services/searchproviders/seek.desktop +debian/tmp/usr/share/services/searchproviders/sourceforge.desktop +debian/tmp/usr/share/services/searchproviders/technorati.desktop +debian/tmp/usr/share/services/searchproviders/technoratitags.desktop +debian/tmp/usr/share/services/searchproviders/thesaurus.desktop +debian/tmp/usr/share/services/searchproviders/tvtome.desktop +debian/tmp/usr/share/services/searchproviders/uspto.desktop +debian/tmp/usr/share/services/searchproviders/vivisimo.desktop +debian/tmp/usr/share/services/searchproviders/voila.desktop +debian/tmp/usr/share/services/searchproviders/webster.desktop +debian/tmp/usr/share/services/searchproviders/whatis.desktop +debian/tmp/usr/share/services/searchproviders/wikipedia.desktop +debian/tmp/usr/share/services/searchproviders/wiktionary.desktop +debian/tmp/usr/share/services/searchproviders/wordref.desktop +debian/tmp/usr/share/services/useragentstrings/firefox10oncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/firefox15oncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/googlebot.desktop +debian/tmp/usr/share/services/useragentstrings/ie401onwinnt4.desktop +debian/tmp/usr/share/services/useragentstrings/ie45onwinnt5.desktop +debian/tmp/usr/share/services/useragentstrings/ie501onwinnt5.desktop +debian/tmp/usr/share/services/useragentstrings/ie50onppc.desktop +debian/tmp/usr/share/services/useragentstrings/ie55onwin98.desktop +debian/tmp/usr/share/services/useragentstrings/ie55onwinnt5.desktop +debian/tmp/usr/share/services/useragentstrings/ie60oncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/ie60onwinnt51.desktop +debian/tmp/usr/share/services/useragentstrings/lynxoncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/mozoncurrent12.desktop +debian/tmp/usr/share/services/useragentstrings/mozoncurrent16.desktop +debian/tmp/usr/share/services/useragentstrings/mozoncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/mozonwin2000.desktop +debian/tmp/usr/share/services/useragentstrings/mozonwinxp.desktop +debian/tmp/usr/share/services/useragentstrings/nn301oncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/nn475oncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/nn475onwin95.desktop +debian/tmp/usr/share/services/useragentstrings/nn476onppc.desktop +debian/tmp/usr/share/services/useragentstrings/ns71oncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/ns71onwinnt51.desktop +debian/tmp/usr/share/services/useragentstrings/op403onwinnt4.desktop +debian/tmp/usr/share/services/useragentstrings/op75oncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/safari20.desktop +debian/tmp/usr/share/services/useragentstrings/safari12.desktop +debian/tmp/usr/share/services/useragentstrings/w3moncurrent.desktop +debian/tmp/usr/share/services/useragentstrings/wgetoncurrent.desktop +debian/tmp/usr/share/servicetypes/searchprovider.desktop +debian/tmp/usr/share/servicetypes/uasprovider.desktop +debian/tmp/usr/share/sounds/KDE_Beep_Ahem.wav +debian/tmp/usr/share/sounds/KDE_Beep_Beep.wav +debian/tmp/usr/share/sounds/KDE_Beep_Bottles.wav +debian/tmp/usr/share/sounds/KDE_Beep_Car.ogg +debian/tmp/usr/share/sounds/KDE_Beep_ClassicBeep.wav +debian/tmp/usr/share/sounds/KDE_Beep_Classic.ogg +debian/tmp/usr/share/sounds/KDE_Beep_ClockChime.wav +debian/tmp/usr/share/sounds/KDE_Beep_Connect.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Connect.wav +debian/tmp/usr/share/sounds/KDE_Beep_Digital_1.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Digital_2.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Door.wav +debian/tmp/usr/share/sounds/KDE_Beep_Double.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Harsh.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Honk.wav +debian/tmp/usr/share/sounds/KDE_Beep_Lightning.wav +debian/tmp/usr/share/sounds/KDE_Beep.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Phone_1.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Phone_2.ogg +debian/tmp/usr/share/sounds/KDE_Beep_Pop.wav +debian/tmp/usr/share/sounds/KDE_Beep_RimShot.wav +debian/tmp/usr/share/sounds/KDE_Beep_RingRing.wav +debian/tmp/usr/share/sounds/KDE_Beep_ShortBeep.wav +debian/tmp/usr/share/sounds/KDE_Beep_Yo.wav +debian/tmp/usr/share/sounds/KDE_Bottles.ogg +debian/tmp/usr/share/sounds/KDE_Chimes_1.ogg +debian/tmp/usr/share/sounds/KDE_Chimes_2.ogg +debian/tmp/usr/share/sounds/KDE_Chimes_3.ogg +debian/tmp/usr/share/sounds/KDE_Click_1.ogg +debian/tmp/usr/share/sounds/KDE_Click_2.ogg +debian/tmp/usr/share/sounds/KDE_Click_3.ogg +debian/tmp/usr/share/sounds/KDE_Click.wav +debian/tmp/usr/share/sounds/KDE_Close_Window.wav +debian/tmp/usr/share/sounds/KDE_Critical_Error.wav +debian/tmp/usr/share/sounds/KDE_Desktop_1.ogg +debian/tmp/usr/share/sounds/KDE_Desktop1.wav +debian/tmp/usr/share/sounds/KDE_Desktop_2.ogg +debian/tmp/usr/share/sounds/KDE_Desktop2.wav +debian/tmp/usr/share/sounds/KDE_Desktop_3.ogg +debian/tmp/usr/share/sounds/KDE_Desktop3.wav +debian/tmp/usr/share/sounds/KDE_Desktop_4.ogg +debian/tmp/usr/share/sounds/KDE_Desktop4.wav +debian/tmp/usr/share/sounds/KDE_Desktop_5.ogg +debian/tmp/usr/share/sounds/KDE_Desktop5.wav +debian/tmp/usr/share/sounds/KDE_Desktop_6.ogg +debian/tmp/usr/share/sounds/KDE_Desktop6.wav +debian/tmp/usr/share/sounds/KDE_Desktop_7.ogg +debian/tmp/usr/share/sounds/KDE_Desktop7.wav +debian/tmp/usr/share/sounds/KDE_Desktop_8.ogg +debian/tmp/usr/share/sounds/KDE_Desktop8.wav +debian/tmp/usr/share/sounds/KDE_Dialog_Appear.ogg +debian/tmp/usr/share/sounds/KDE_Dialog_Appear.wav +debian/tmp/usr/share/sounds/KDE_Dialog_Disappear.ogg +debian/tmp/usr/share/sounds/KDE_Dialog_Disappear.wav +debian/tmp/usr/share/sounds/KDE_Door.ogg +debian/tmp/usr/share/sounds/KDE_Drum_Break.ogg +debian/tmp/usr/share/sounds/KDE_Error_1.ogg +debian/tmp/usr/share/sounds/KDE_Error_2.ogg +debian/tmp/usr/share/sounds/KDE_Error_3.ogg +debian/tmp/usr/share/sounds/KDE_Error.wav +debian/tmp/usr/share/sounds/KDE_Event_1.ogg +debian/tmp/usr/share/sounds/KDE_Event_2.ogg +debian/tmp/usr/share/sounds/KDE_Event_3.ogg +debian/tmp/usr/share/sounds/KDE_Event_4.ogg +debian/tmp/usr/share/sounds/KDE_Event_5.ogg +debian/tmp/usr/share/sounds/KDE_Glass_Break.ogg +debian/tmp/usr/share/sounds/KDE_Keyboard_Key_1.ogg +debian/tmp/usr/share/sounds/KDE_Logout_1.ogg +debian/tmp/usr/share/sounds/KDE_Logout_2.ogg +debian/tmp/usr/share/sounds/KDE_Logout_3.ogg +debian/tmp/usr/share/sounds/KDE_Logout.wav +debian/tmp/usr/share/sounds/KDE_Notify.wav +debian/tmp/usr/share/sounds/KDE_Pop.ogg +debian/tmp/usr/share/sounds/KDE_Star_Ship_1.ogg +debian/tmp/usr/share/sounds/KDE_Startup_1.ogg +debian/tmp/usr/share/sounds/KDE_Startup_2.ogg +debian/tmp/usr/share/sounds/KDE_Startup_3.ogg +debian/tmp/usr/share/sounds/KDE_Startup.wav +debian/tmp/usr/share/sounds/KDE_TypeWriter_Bell.ogg +debian/tmp/usr/share/sounds/KDE_TypeWriter_End_Of_Line.ogg +debian/tmp/usr/share/sounds/KDE_TypeWriter_Key_1.ogg +debian/tmp/usr/share/sounds/KDE_TypeWriter_Key_2.ogg +debian/tmp/usr/share/sounds/KDE_TypeWriter_Reload.ogg +debian/tmp/usr/share/sounds/KDE_TypeWriter_Scroll.ogg +debian/tmp/usr/share/sounds/KDE_Vox_Ahem.ogg +debian/tmp/usr/share/sounds/KDE_Vox_Yo.ogg +debian/tmp/usr/share/sounds/KDE_Warp.ogg +debian/tmp/usr/share/sounds/KDE_Water_Drop.ogg +debian/tmp/usr/share/sounds/KDE_Window_Close.ogg +debian/tmp/usr/share/sounds/KDE_Window_Close.wav +debian/tmp/usr/share/sounds/KDE_Window_DeIconify.ogg +debian/tmp/usr/share/sounds/KDE_Window_DeIconify.wav +debian/tmp/usr/share/sounds/KDE_Window_Hide.ogg +debian/tmp/usr/share/sounds/KDE_Window_Iconify.ogg +debian/tmp/usr/share/sounds/KDE_Window_Iconify.wav +debian/tmp/usr/share/sounds/KDE_Window_Maximize.wav +debian/tmp/usr/share/sounds/KDE_Window_Open.ogg +debian/tmp/usr/share/sounds/KDE_Window_Open.wav +debian/tmp/usr/share/sounds/KDE_Window_Shade_Down.ogg +debian/tmp/usr/share/sounds/KDE_Window_Shade_Down.wav +debian/tmp/usr/share/sounds/KDE_Window_Shade_Up.ogg +debian/tmp/usr/share/sounds/KDE_Window_Shade_Up.wav +debian/tmp/usr/share/sounds/KDE_Window_Sticky.ogg +debian/tmp/usr/share/sounds/KDE_Window_Sticky.wav +debian/tmp/usr/share/sounds/KDE_Window_UnHide.ogg +debian/tmp/usr/share/sounds/KDE_Window_UnMaximize.wav +debian/tmp/usr/share/sounds/KDE_Window_UnSticky.ogg +debian/tmp/usr/share/sounds/KDE_Window_UnSticky.wav +debian/tmp/usr/share/wallpapers/All-Good-People-1.jpg +debian/tmp/usr/share/wallpapers/All-Good-People-1.jpg.desktop +debian/tmp/usr/share/wallpapers/alta-badia.jpg +debian/tmp/usr/share/wallpapers/alta-badia.jpg.desktop +debian/tmp/usr/share/wallpapers/andes-venezolanos.svgz +debian/tmp/usr/share/wallpapers/andes-venezolanos.svgz.desktop +debian/tmp/usr/share/wallpapers/aurora.svgz +debian/tmp/usr/share/wallpapers/aurora.svgz.desktop +debian/tmp/usr/share/wallpapers/blue-bend.jpg +debian/tmp/usr/share/wallpapers/blue-bend.jpg.desktop +debian/tmp/usr/share/wallpapers/celtic.svgz +debian/tmp/usr/share/wallpapers/celtic.svgz.desktop +debian/tmp/usr/share/wallpapers/Chicken-Songs-2.jpg +debian/tmp/usr/share/wallpapers/Chicken-Songs-2.jpg.desktop +debian/tmp/usr/share/wallpapers/default_blue.jpg +debian/tmp/usr/share/wallpapers/default_blue.jpg.desktop +debian/tmp/usr/share/wallpapers/default_gears.jpg +debian/tmp/usr/share/wallpapers/default_gears.jpg.desktop +debian/tmp/usr/share/wallpapers/floating-leaves.jpg +debian/tmp/usr/share/wallpapers/floating-leaves.jpg.desktop +debian/tmp/usr/share/wallpapers/globe.svgz +debian/tmp/usr/share/wallpapers/globe.svgz.desktop +debian/tmp/usr/share/wallpapers/here-gear.svgz +debian/tmp/usr/share/wallpapers/here-gear.svgz.desktop +debian/tmp/usr/share/wallpapers/KDE34.png +debian/tmp/usr/share/wallpapers/KDE34.png.desktop +debian/tmp/usr/share/wallpapers/konqui.svgz +debian/tmp/usr/share/wallpapers/konqui.svgz.desktop +debian/tmp/usr/share/wallpapers/lineart.svgz +debian/tmp/usr/share/wallpapers/lineart.svgz.desktop +debian/tmp/usr/share/wallpapers/moon.svgz +debian/tmp/usr/share/wallpapers/moon.svgz.desktop +debian/tmp/usr/share/wallpapers/No-Ones-Laughing-3.jpg +debian/tmp/usr/share/wallpapers/No-Ones-Laughing-3.jpg.desktop +debian/tmp/usr/share/wallpapers/seaofconero.jpg +debian/tmp/usr/share/wallpapers/seaofconero.jpg.desktop +debian/tmp/usr/share/wallpapers/soft-green.jpg +debian/tmp/usr/share/wallpapers/soft-green.jpg.desktop +debian/tmp/usr/share/wallpapers/stelvio.jpg +debian/tmp/usr/share/wallpapers/stelvio.jpg.desktop +debian/tmp/usr/share/wallpapers/sunshine-after-the-rain.jpg +debian/tmp/usr/share/wallpapers/sunshine-after-the-rain.jpg.desktop +debian/tmp/usr/share/wallpapers/Time-For-Lunch-2.jpg +debian/tmp/usr/share/wallpapers/Time-For-Lunch-2.jpg.desktop +debian/tmp/usr/share/wallpapers/Totally-New-Product-1.jpg +debian/tmp/usr/share/wallpapers/Totally-New-Product-1.jpg.desktop +debian/tmp/usr/share/wallpapers/triplegears.jpg +debian/tmp/usr/share/wallpapers/triplegears.jpg.desktop +debian/tmp/usr/share/wallpapers/Won-Ton-Soup-3.jpg +debian/tmp/usr/share/wallpapers/Won-Ton-Soup-3.jpg.desktop --- kdebase-3.5.6.orig/debian/kwin.lintian +++ kdebase-3.5.6/debian/kwin.lintian @@ -0,0 +1,2 @@ +kwin: shlib-missing-in-control-file libkdeinit_kwin.so usr/lib/libkdeinit_kwin.so +kwin: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so usr/lib/libkdeinit_kwin_rules_dialog.so --- kdebase-3.5.6.orig/debian/kdebase-bin.lintian +++ kdebase-3.5.6/debian/kdebase-bin.lintian @@ -0,0 +1,6 @@ +kdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup +kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so +kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so +kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so +kdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so +kdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so --- kdebase-3.5.6.orig/debian/kcontrol.README.Debian +++ kdebase-3.5.6/debian/kcontrol.README.Debian @@ -0,0 +1,18 @@ +KControl and Logitech mice +========================== + +In combination with the udev or hotplug packages, KControl supports the +advanced configuration of many models of Logitech mice, though regular users +must be members of the plugdev group for this to work. + +Additionally, the system's kernel must be 2.6.14 or later if you are using +udev, though earlier kernels are also supported if the hotplug package is being +used instead. Kernel hotplugging support is essential, as is usbfs/usbdevfs if +hotplug is being used. + +After installing KControl for the first time, or updating to KControl 3.4.x +or later from an earlier package, you will need to unplug and then replug +your mouse, in order to force udev or hotplug to grant special permissions +to your mouse, so that KControl can perform advanced configuration. +Rebooting or restarting udev/hotplug will of course accomplish the same +thing. --- kdebase-3.5.6.orig/debian/khelpcenter.menu +++ kdebase-3.5.6/debian/khelpcenter.menu @@ -0,0 +1,11 @@ +?package(khelpcenter):\ + needs="X11"\ + section="Help"\ + hints="KDE"\ + title="KDE Help Center"\ + icon32x32="/usr/share/pixmaps/khelpcenter.xpm"\ + icon16x16="/usr/share/pixmaps/khelpcenter-16.xpm"\ + command="/usr/bin/khelpcenter" + +# Icon 32x32 khelpcenter/pics/cr32-app-khelpcenter.png khelpcenter.xpm +# Icon 16x16 khelpcenter/pics/cr16-app-khelpcenter.png khelpcenter-16.xpm --- kdebase-3.5.6.orig/debian/ksplash.install +++ kdebase-3.5.6/debian/ksplash.install @@ -0,0 +1,53 @@ +debian/tmp/usr/bin/ksplash +debian/tmp/usr/bin/ksplashsimple +debian/tmp/usr/lib/kde3/kcm_ksplashthemes.la +debian/tmp/usr/lib/kde3/kcm_ksplashthemes.so +debian/tmp/usr/lib/kde3/ksplashdefault.la +debian/tmp/usr/lib/kde3/ksplashdefault.so +debian/tmp/usr/lib/kde3/ksplashredmond.la +debian/tmp/usr/lib/kde3/ksplashredmond.so +debian/tmp/usr/lib/kde3/ksplashstandard.la +debian/tmp/usr/lib/kde3/ksplashstandard.so +debian/tmp/usr/lib/libksplashthemes.so.0 +debian/tmp/usr/lib/libksplashthemes.so.0.0.0 +debian/tmp/usr/share/applications/kde/ksplashthememgr.desktop +debian/tmp/usr/share/apps/ksplash/pics/splash.png +debian/tmp/usr/share/apps/ksplash/Themes/blue-bend/Preview.png +debian/tmp/usr/share/apps/ksplash/Themes/blue-bend/splash_active_bar.png +debian/tmp/usr/share/apps/ksplash/Themes/blue-bend/splash_bottom.png +debian/tmp/usr/share/apps/ksplash/Themes/blue-bend/splash_inactive_bar.png +debian/tmp/usr/share/apps/ksplash/Themes/blue-bend/splash_top.png +debian/tmp/usr/share/apps/ksplash/Themes/blue-bend/Theme.rc +debian/tmp/usr/share/apps/ksplash/Themes/Default/locolor/splash_active_bar.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/locolor/splash_bottom.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/locolor/splash_inactive_bar.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/locolor/splash_top.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/locolor/Theme.rc +debian/tmp/usr/share/apps/ksplash/Themes/Default/Preview.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/splash_active_bar.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/splash_bottom.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/splash_inactive_bar.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/splash_top.png +debian/tmp/usr/share/apps/ksplash/Themes/Default/Theme.rc +debian/tmp/usr/share/apps/ksplash/Themes/None/Theme.rc +debian/tmp/usr/share/apps/ksplash/Themes/Redmond/Background.png +debian/tmp/usr/share/apps/ksplash/Themes/Redmond/Preview.png +debian/tmp/usr/share/apps/ksplash/Themes/Redmond/Theme.rc +debian/tmp/usr/share/apps/ksplash/Themes/Simple/Preview.png +debian/tmp/usr/share/apps/ksplash/Themes/Simple/Theme.rc +debian/tmp/usr/share/apps/ksplash/Themes/Standard/Preview.png +debian/tmp/usr/share/apps/ksplash/Themes/Standard/Theme.rc +debian/tmp/usr/share/doc/kde/HTML/en/ksplashml/common +debian/tmp/usr/share/doc/kde/HTML/en/ksplashml/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/ksplashml/index.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/ksplash.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/ksplash.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/ksplash.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/ksplash.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/ksplash.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/ksplash.png +debian/tmp/usr/share/services/ksplashdefault.desktop +debian/tmp/usr/share/services/ksplash.desktop +debian/tmp/usr/share/services/ksplashredmond.desktop +debian/tmp/usr/share/services/ksplashstandard.desktop +debian/tmp/usr/share/servicetypes/ksplashplugins.desktop --- kdebase-3.5.6.orig/debian/kdebase-bin.manpages +++ kdebase-3.5.6/debian/kdebase-bin.manpages @@ -0,0 +1,17 @@ +debian/man/drkonqi.1 +debian/man/kblankscrn.kss.1 +debian/man/kcheckpass.1 +debian/man/kcminit.1 +debian/man/kdcop.1 +debian/man/kdebugdialog.1 +debian/man/kdesu.1 +debian/man/kdialog.1 +debian/man/khotkeys.1 +debian/man/kio_system_documenthelper.1 +debian/man/knetattach.1 +debian/man/krandom.kss.1 +debian/man/kreadconfig.1 +debian/man/kstart.1 +debian/man/ksystraycmd.1 +debian/man/kwriteconfig.1 +debian/man/kxkb.1 --- kdebase-3.5.6.orig/debian/kdepasswd.menu +++ kdebase-3.5.6/debian/kdepasswd.menu @@ -0,0 +1,6 @@ +?package(kdepasswd):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="kdepasswd"\ + command="/usr/bin/kdepasswd" --- kdebase-3.5.6.orig/debian/kdm.pam +++ kdebase-3.5.6/debian/kdm.pam @@ -0,0 +1,11 @@ +# +# /etc/pam.d/kdm - specify the PAM behaviour of kdm +# +auth required pam_nologin.so +auth required pam_env.so readenv=1 +auth required pam_env.so readenv=1 envfile=/etc/default/locale +@include common-auth +session required pam_limits.so +@include common-account +@include common-password +@include common-session --- kdebase-3.5.6.orig/debian/control +++ kdebase-3.5.6/debian/control @@ -0,0 +1,537 @@ +Source: kdebase +Section: kde +Priority: optional +Maintainer: Jonathan Riddell +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Uploaders: Isaac Clerencia , Pierre Habouzit , Christopher Martin , Adeodato Simó , Riku Voipio , Luk Claes +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.6), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, libxkbfile-dev, xmkmf, sudo +Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc +Build-Conflicts: nvidia-glx (<< 1.0.8774-6) +Standards-Version: 3.7.2 + +Package: kdebase +Section: kde +Architecture: all +Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), kdebase-bin (>= ${Source-Version}), kdebase-data (>= ${Source-Version}), kdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal, pmount +Recommends: kdm (>= ${Source-Version}) +Suggests: kdebase-doc-html (>= ${Source-Version}) +Description: base components from the official KDE release + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes the nucleus of KDE, namely the minimal package + set necessary to run KDE as a desktop environment. This includes the + window manager, taskbar, control center, a text editor, file manager, + web browser, X terminal emulator, and many other programs and components. + +Package: kappfinder +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kdebase (<< 4:3.0.0) +Description: non-KDE application finder for KDE + kappfinder searches your workstation for many common applications and + creates menu entries for them. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kate +Section: editors +Architecture: any +Depends: ${shlibs:Depends} +Recommends: kregexpeditor +Suggests: aspell | ispell | hspell, kate-plugins, khelpcenter, konsole +Replaces: kdebase-doc (<< 4:3.0.0) +Description: advanced text editor for KDE + Kate is a multi document editor, based on a rewritten version of the kwrite + editing widget of KDE. + . + It is a multi-view editor that lets you view several instances of the same + document with all instances being synced, or view more files at the same + time for easy reference or simultaneous editing. The terminal emulation + and sidebar are docked windows that can be plugged out of the main window, + or replaced therein according to your preference. + . + Some random features: + . + * Editing of big files + * Extensible syntax highlighting + * Folding + * Dynamic word wrap + * Selectable encoding + * Filter command + * Global grep dialog + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kcontrol +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), usbutils +Recommends: udev | hotplug +Suggests: khelpcenter, ntpdate | ntp-simple +Conflicts: kdebase-libs (<< 4:3.0.0) +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0) +Description: control center for KDE + The KDE Control Center provides you with a centralized and convenient + way to configure all of your KDE settings. + . + It is made up of multiple modules. Each module is a separate application, + but the control center organizes all of these programs into a convenient + location. + . + In combination with udev or hotplug, KControl supports the advanced + configuration of Logitech mice, though the user must be a member of the + plugdev group. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdebase-bin +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) +Recommends: gdb +Suggests: khelpcenter +Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2) +Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b) +Description: core binaries for the KDE base module + This package contains miscellaneous programs needed by other + KDE applications, particularly those in the KDE base module. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdebase-data +Section: kde +Architecture: all +Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1) +Replaces: kdebase (<< 4:3.0.0), kdeedu-data (<< 4:3.4.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18) +Description: shared data files for the KDE base module + This package contains the architecture-independent shared data files + needed for a basic KDE desktop installation. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdebase-dev +Section: devel +Architecture: any +Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.5) +Replaces: kate (<< 4:3.0.0), kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0) +Description: development files for the KDE base module + This package contains headers and other development files needed to + compile software based on the KDE base module. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdebase-doc +Section: doc +Architecture: all +Replaces: libkonq4-dev (<< 4:3.2.0) +Description: developer documentation for the KDE base module + This package contains documentation for the KDE base module, of + use more for developers creating applications than regular users. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdebase-doc-html +Architecture: all +Section: doc +Suggests: konqueror | www-browser, kdebase +Description: KDE base documentation in HTML format + By default the modules provided by KDE only provide their documentation + in KDE docbook format, which can only be read by Konqueror or KHelpCenter. + This package provides all of the KDE base documentation converted to + HTML format so it can be read with any web browser. + . + The documentation will be installed into the usual directories + /usr/share/doc/kde/HTML///, for instance + /usr/share/doc/kde/HTML/en/kate/. Documentation is provided for most + KDE base packages. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdebase-kio-plugins +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc +Recommends: hal, pmount, kamera, kdemultimedia-kio-plugins +Suggests: khelpcenter, mtools +Conflicts: kdebase-libs (<< 4:3.0.0) +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0), kdebase-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18) +Description: core I/O slaves for KDE + This package includes the base kioslaves. They include, amongst many + others, file, http, ftp, smtp, pop and imap. + . + It also includes the media kioslave, which handles removable devices, + and which works best with hal (and therefore udev) and pmount. Media + also extends the functionality of many other kioslaves. To use this + service, please make sure that your user is a member of the plugdev + group. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdepasswd +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Description: password changer for KDE + This is a simple application which allows users to change their + system passwords. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdeprint +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, enscript, poster, psutils +Recommends: kghostview | postscript-viewer +Suggests: khelpcenter, efax | hylafax-client | mgetty-fax +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0) +Description: print system for KDE + This package contains the KDE printing subsystem. It can use CUPS, + lpd-ng or the traditional lpd. It also includes support for fax and + pdf printing. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + . + Homepage: http://printing.kde.org + +Package: kdesktop +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), eject +Replaces: kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0) +Description: miscellaneous binaries and files for the KDE desktop + This package contains miscellaneous binaries and files integral to + the KDE desktop. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdm +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients +Recommends: logrotate +Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu +Provides: x-display-manager +Description: X display manager for KDE + kdm manages a collection of X servers, which may be on the local host or + remote machines. It provides services similar to those provided by init, + getty, and login on character-based terminals: prompting for login name and + password, authenticating the user, and running a session. kdm supports XDMCP + (X Display Manager Control Protocol) and can also be used to run a chooser + process which presents the user with a menu of possible hosts that offer + XDMCP display management. + . + A collection of icons to associate with individual users is included with + KDE, but as part of the kdepasswd package. + . + The menu package will help to provide KDM with a list of window managers + that can be launched, if the window manager does not register with KDM + already. Most users won't need this. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kfind +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Conflicts: kdebase-libs (<< 4:3.0.0) +Replaces: kdebase (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0) +Description: file-find utility for KDE + kfind can be used to find files and directories on your + workstations. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: khelpcenter +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kdebase-doc (<< 4:3.0.0), konqueror (<< 4:3.0.0) +Suggests: htdig +Description: help center for KDE + The KDE Help Center provides documentation on how to use the KDE desktop. + . + The htdig package is needed to build a searchable archive of KDE + documentation. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kicker +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}) +Suggests: khelpcenter, kicker-applets, menu +Conflicts: kdebase-libs (<< 4:3.0.0) +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0) +Description: desktop panel for KDE + Kicker provides the KDE panel on you desktop. It can be used as a + program launcher and can load plugins to provide additional + functionality. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: klipper +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0) +Description: clipboard utility for KDE + klipper provides several additional features of the traditional clipboard + functionality like the ability to offer actions to take dependent on + the clipboard contents. For example, it can launch a web browser if the + clipboard contains a URL. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kmenuedit +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0) +Description: menu editor for KDE + The KDE menu editor allows you to make customisations to the KDE menu + structure. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: konqueror +Section: web +Architecture: any +Provides: info-browser, man-browser, www-browser +Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), kdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version}) +Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java +Conflicts: kdebase-audiolibs (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0) +Replaces: kdebase (<< 4:3.0.0), kdebase-audiolibs (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0) +Description: KDE's advanced file manager, web browser and document viewer + Konqueror is the file manager for the K Desktop Environment. + It supports basic file management on local UNIX filesystems, + from simple cut/copy and paste operations to advanced remote + and local network file browsing. + . + It is also the canvas for all the latest KDE technology, + from KIO slaves (which provide mechanisms for file access) to + component embedding via the KParts object interface, and it + is one of the most customizable applications available. + . + Konqueror is an Open Source web browser with HTML4.0 compliance, + supporting Java applets, JavaScript, CSS1 and (partially) CSS2, + as well as Netscape plugins (for example, Flash or RealVideo plugins). + . + It is a universal viewing application, capable of embedding + read-only viewing components in itself to view documents without + ever launching another application. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + . + Homepage: http://konqueror.kde.org + +Package: konqueror-nsplugins +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Replaces: konqueror (<< 4:3.0.0) +Description: Netscape plugin support for Konqueror + This package includes support for Netscape plugins in Konqueror. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: konsole +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kdebase (<< 4:3.0.0) +Suggests: khelpcenter +Provides: x-terminal-emulator +Description: X terminal emulator for KDE + Konsole is an X terminal emulation which provides a command-line interface + (CLI) while using the graphical K Desktop Environment. Konsole helps to + better organize user's desktop by containing multiple sessions in a single + window (a less cluttered desktop). + . + Its advanced features include a simple configuration and the ability to use + multiple terminal shells in a single window + . + Using Konsole, a user can open: + . + Linux console sessions + Midnight Commander file manager sessions + Shell sessions + Root consoles sessions + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kpager +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Suggests: khelpcenter +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0) +Description: desktop pager for KDE + This package contains KDE's desktop pager, which displays your virtual + desktops iconically in a window, along with icons of any running + applications. It is used to switch between applications or desktops. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kpersonalizer +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}) +Replaces: kdebase (<< 4:3.0.0) +Description: installation personalizer for KDE + KDE Personalizer is the application that configures the KDE desktop for you. + It's a very useful wizard that allows you to quickly change the KDE desktop to + suit your own needs. When you run KDE for the first time, KPersonalizer is + automatically started. KPersonalizer can also be called later. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: ksmserver +Section: kde +Architecture: any +Provides: x-session-manager +Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager +Recommends: kpersonalizer (= ${Source-Version}) +Replaces: kdebase (<< 4:3.0.0) +Description: session manager for KDE + This package contains the KDE session manager. It is responsible for + restoring your KDE session on login. It is also needed to properly + start a KDE session. It registers KDE with X display managers, and + provides the 'startkde' command, for starting an X session with KDE + from the console. + . + If you are running KDE for the first time for a certain user, + kpersonalizer is used to help with setup. If it is not present, + KDE will start, but many good defaults will not be set. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: ksplash +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}) +Suggests: khelpcenter +Replaces: kdebase (<< 4:3.0.0) +Description: the KDE splash screen + This package includes the KDE Splash screen, which is seen when + a KDE session is launched. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: ksysguard +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ksysguardd (= ${Source-Version}) +Suggests: khelpcenter +Conflicts: kpm (<< 4:3.0.0) +Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kpm (<< 4:3.0.0) +Description: system guard for KDE + KDE System Guard allows you to monitor various statistics about your + computer. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: ksysguardd +Section: utils +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kdebase (<< 4:3.0.0) +Description: system guard daemon for KDE + KDE System Guard Daemon is the daemon part of ksysguard. The daemon can + be installed on a remote machine to enable ksysguard on another machine + to monitor it through the daemon running there. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: ktip +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kdebase (<< 4:3.0.0) +Description: useful tips for KDE + ktip provides many useful tips on using KDE when you log in. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kwin +Section: kde +Architecture: any +Depends: ${shlibs:Depends} +Provides: x-window-manager +Suggests: kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}) +Replaces: kdeartwork-theme-window (<< 4:3.4.0), kdebase (<< 4:3.0.0) +Description: the KDE window manager + This package contains the default X window manager for KDE. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: libkonq4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: kdebase-libs (<< 4:3.0.0) +Replaces: kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0) +Description: core libraries for Konqueror + These libraries are used by several KDE applications, most notably + Konqueror and the kdesktop package. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: libkonq4-dev +Section: libdevel +Architecture: any +Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.5) +Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0) +Replaces: kdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0) +Description: development files for Konqueror's core libraries + This package contains headers and other development files for the core + Konqueror libraries. + . + This package is part of KDE, and a component of the KDE base module. + See the 'kde' and 'kdebase' packages for more information. + +Package: kdebase-dbg +Section: libdevel +Architecture: any +Priority: extra +Depends: libkonq4 (= ${Source-Version}) +Description: debugging symbols for kdebase + This package contains the debugging symbols associated with kdebase. + They will automatically be used by gdb for debugging kdebase-related + issues. --- kdebase-3.5.6.orig/debian/kdeprint.install +++ kdebase-3.5.6/debian/kdeprint.install @@ -0,0 +1,150 @@ +debian/tmp/usr/bin/kdeprintfax +debian/tmp/usr/bin/kjobviewer +debian/tmp/usr/bin/kprinter +debian/tmp/usr/lib/kde3/kcm_printmgr.la +debian/tmp/usr/lib/kde3/kcm_printmgr.so +debian/tmp/usr/lib/kde3/kio_print.la +debian/tmp/usr/lib/kde3/kio_print.so +debian/tmp/usr/lib/kde3/kjobviewer.la +debian/tmp/usr/lib/kde3/kjobviewer.so +debian/tmp/usr/lib/kde3/kprinter.la +debian/tmp/usr/lib/kde3/kprinter.so +debian/tmp/usr/lib/kde3/libkdeprint_part.la +debian/tmp/usr/lib/kde3/libkdeprint_part.so +debian/tmp/usr/lib/libkdeinit_kjobviewer.so +debian/tmp/usr/lib/libkdeinit_kprinter.so +debian/tmp/usr/share/applications/kde/kdeprintfax.desktop +debian/tmp/usr/share/applications/kde/kjobviewer.desktop +debian/tmp/usr/share/applications/kde/printers.desktop +debian/tmp/usr/share/apps/kdeprintfax/anytops +debian/tmp/usr/share/apps/kdeprintfax/faxfilters +debian/tmp/usr/share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png +debian/tmp/usr/share/apps/kdeprintfax/kdeprintfaxui.rc +debian/tmp/usr/share/apps/kdeprint_part/kdeprint_part.rc +debian/tmp/usr/share/apps/kdeprint/template/bar-bottom-left.png +debian/tmp/usr/share/apps/kdeprint/template/bar-bottom-middle.png +debian/tmp/usr/share/apps/kdeprint/template/bar-bottom-right.png +debian/tmp/usr/share/apps/kdeprint/template/bar-middle-left.png +debian/tmp/usr/share/apps/kdeprint/template/bar-middle-right.png +debian/tmp/usr/share/apps/kdeprint/template/bar-top-left.png +debian/tmp/usr/share/apps/kdeprint/template/bar-top-middle.png +debian/tmp/usr/share/apps/kdeprint/template/bar-top-right.png +debian/tmp/usr/share/apps/kdeprint/template/bottom-left.png +debian/tmp/usr/share/apps/kdeprint/template/bottom-middle.png +debian/tmp/usr/share/apps/kdeprint/template/bottom-right.png +debian/tmp/usr/share/apps/kdeprint/template/box-bottom-left.png +debian/tmp/usr/share/apps/kdeprint/template/box-bottom-middle.png +debian/tmp/usr/share/apps/kdeprint/template/box-bottom-right.png +debian/tmp/usr/share/apps/kdeprint/template/box-centre-kdeprint.png +debian/tmp/usr/share/apps/kdeprint/template/box-middle-left.png +debian/tmp/usr/share/apps/kdeprint/template/box-middle-right.png +debian/tmp/usr/share/apps/kdeprint/template/box-top-left.png +debian/tmp/usr/share/apps/kdeprint/template/box-top-middle.png +debian/tmp/usr/share/apps/kdeprint/template/box-top-right.png +debian/tmp/usr/share/apps/kdeprint/template/class.template +debian/tmp/usr/share/apps/kdeprint/template/driver.template +debian/tmp/usr/share/apps/kdeprint/template/htmlstyles.css +debian/tmp/usr/share/apps/kdeprint/template/jobs.template +debian/tmp/usr/share/apps/kdeprint/template/printer.template +debian/tmp/usr/share/apps/kdeprint/template/pseudo.template +debian/tmp/usr/share/apps/kdeprint/template/top-left.png +debian/tmp/usr/share/apps/kdeprint/template/top-middle.png +debian/tmp/usr/share/apps/kdeprint/template/top-right-kdeprint.png +debian/tmp/usr/share/apps/kjobviewer/kjobviewerui.rc +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/add-printer-wiz.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/common +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cr32-action-wizard.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cups-config.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsoptions.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration2_general.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration3_logging.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration4_directories.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/extensions.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/external-command.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/final-word.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/getting-started.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/highlights.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kcontrol-icon.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kcron_to_be_printed.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kdeprint-jobviewer.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kprinter_called_from_run_command.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kprinter-kivio.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kprinter.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/lpd.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/lpr-bsd.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/lprng.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/ps-boxes.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/rlpr.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/steinbruch_scaled.png +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/tech-overview.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdeprint/theory.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/kdeprintfax.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/kjobviewer.png +debian/tmp/usr/share/icons/hicolor/128x128/apps/printmgr.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kdeprintfax.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kjobviewer.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/printmgr.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kdeprintfax.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kjobviewer.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/printmgr.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kdeprintfax.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kjobviewer.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/printmgr.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kdeprintfax.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kjobviewer.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/printmgr.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kdeprintfax.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kjobviewer.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/printmgr.png +debian/tmp/usr/share/icons/hicolor/scalable/apps/kdeprintfax.svgz +debian/tmp/usr/share/icons/hicolor/scalable/apps/kjobviewer.svgz +debian/tmp/usr/share/icons/hicolor/scalable/apps/printmgr.svgz +debian/tmp/usr/share/mimelnk/print/class.desktop +debian/tmp/usr/share/mimelnk/print/driver.desktop +debian/tmp/usr/share/mimelnk/print/folder.desktop +debian/tmp/usr/share/mimelnk/print/jobs.desktop +debian/tmp/usr/share/mimelnk/print/manager.desktop +debian/tmp/usr/share/mimelnk/print/printer.desktop +debian/tmp/usr/share/mimelnk/print/printermodel.desktop +debian/tmp/usr/share/services/kdeprint_part.desktop +debian/tmp/usr/share/services/printdb.protocol +debian/tmp/usr/share/services/print.protocol + +debian/icons/kjobviewer.xpm /usr/share/pixmaps +debian/icons/kjobviewer-16.xpm /usr/share/pixmaps +debian/icons/kdeprint.xpm /usr/share/pixmaps +debian/icons/kdeprint-16.xpm /usr/share/pixmaps +debian/icons/kdeprintfax.xpm /usr/share/pixmaps +debian/icons/kdeprintfax-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/konqueror.lintian +++ kdebase-3.5.6/debian/konqueror.lintian @@ -0,0 +1,3 @@ +konqueror: shlib-missing-in-control-file libkdeinit_keditbookmarks.so usr/lib/libkdeinit_keditbookmarks.so +konqueror: shlib-missing-in-control-file libkdeinit_kfmclient.so usr/lib/libkdeinit_kfmclient.so +konqueror: shlib-missing-in-control-file libkdeinit_konqueror.so usr/lib/libkdeinit_konqueror.so --- kdebase-3.5.6.orig/debian/kdm.README.Debian +++ kdebase-3.5.6/debian/kdm.README.Debian @@ -0,0 +1,72 @@ +KDM in Debian +============= + +This package comes with a copy of the KDM handbook in docbook format. +To read it, run "khelpcenter help:/kdm" from a command-line or go to the +URL "help:/kdm" in konqueror. + +By default, the use of special graphical themes with KDM is disabled. +If you wish to use the 'Circles' theme that comes with the kdm package, or +any other theme that you have installed, you should research the +'UseTheme' and 'Theme' fields in /etc/kde3/kdm/kdmrc. This can be done +by browsing this URL in Konqueror: + +help:/kdm/kdm-files.html#kdmrc-greeter + + +================================================ +Below this is direct from the xdm package README +================================================ + +Debian README for the xdm package: + +Newcomers to the X Window System should first read the file +/usr/share/doc/x11-common/FAQ.gz. You can view this file with your +favorite pager program after decompressing it. For example: + $ zcat /usr/share/doc/x11-common/FAQ.gz | pager + +The default configuration for the X display manager (xdm) under Debian +GNU/Linux presumes that one wishes xdm to manage one local session. (In +other words, the xdm login screen occupies one virtual console +automatically at boot.) If one does not wish to run a local X server, the +following line should be commented out of /etc/X11/xdm/Xservers: + +:0 local /usr/bin/X11/X vt7 -deferglyphs 16 + +Several configuration files are shipped with the xdm package; they reside +in the /etc/X11/xdm/ directory. Extensive documentation about the xdm +configuration files may be found in the xdm(1) manual page. + +xdm-config contains X resources specific to xdm itself. See the X(1) +manual page for more information about X resources, and the xdm(1) manual +pages for documentation of the available xdm resources. + +Xresources contains X resources that are designed to be specfic to sessions +running under xdm. Note that this file does contain the resource entries +for xdm itself -- those are contained in the file xdm-config. See the X(1) +manual page for more information about X resources. + +The above three files, despite being X resource files, are not placed in the +/etc/X11/Xresources directory (see /usr/share/doc/xbase/README.Debian) because +they should not be used automatically in all X sessions; the /etc/X11/Xsession +script merges in the resources of all files found in /etc/X11/Xresources, and +this action would be inappropriate for these resource files. + +Xservers contains entries to start the X server(s) on the local machine, and +on any remote X terminals that do not support XDMCP. This file is internally +documented. + +Xaccess determines what hosts on the network may use the services of the +running xdm daemon. This file is internally documented. Note that as of +version 3.3.4-1 of the xdm package, all remote XDMCP access is turned off +by default. + +Xstartup is a shell script which is run (as root) after a user has logged in +on a server. + +Xreset is a shell script which is run (as root) after a user's X session ends on +a server. + +xdm.options contains configuration options for xdm that are specific to the +Debian GNU/Linux system. See the xdm.options(5) manual page for more +information. --- kdebase-3.5.6.orig/debian/kicker.manpages +++ kdebase-3.5.6/debian/kicker.manpages @@ -0,0 +1,4 @@ +debian/man/appletproxy.1 +debian/man/extensionproxy.1 +debian/man/kasbar.1 +debian/man/kicker.1 --- kdebase-3.5.6.orig/debian/kappfinder.menu +++ kdebase-3.5.6/debian/kappfinder.menu @@ -0,0 +1,11 @@ +?package(kappfinder):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="kAppfinder"\ + icon32x32="/usr/share/pixmaps/kappfinder.xpm"\ + icon16x16="/usr/share/pixmaps/kappfinder-16.xpm"\ + command="/usr/bin/kappfinder" + +# Icon 32x32 kappfinder/cr32-app-kappfinder.png kappfinder.xpm +# Icon 16x16 kappfinder/cr16-app-kappfinder.png kappfinder-16.xpm --- kdebase-3.5.6.orig/debian/kdm.install +++ kdebase-3.5.6/debian/kdm.install @@ -0,0 +1,52 @@ +debian/local/kdm.options etc/kde3/kdm/ +debian/tmp/etc/kde3/kdm/backgroundrc +debian/tmp/etc/kde3/kdm/kdmrc +debian/tmp/etc/kde3/kdm/Xaccess +debian/tmp/etc/kde3/kdm/Xreset +debian/tmp/etc/kde3/kdm/Xsession +debian/tmp/etc/kde3/kdm/Xsetup +debian/tmp/etc/kde3/kdm/Xstartup +debian/tmp/etc/kde3/kdm/Xwilling +debian/tmp/usr/bin/genkdmconf +debian/tmp/usr/bin/kdm +debian/tmp/usr/bin/kdm_config +debian/tmp/usr/bin/kdmctl +debian/tmp/usr/bin/kdm_greet +debian/tmp/usr/bin/krootimage +debian/tmp/usr/share/apps/kdm/pics/kdelogo-crystal.png +debian/tmp/usr/share/apps/kdm/pics/kdelogo.png +debian/tmp/usr/share/apps/kdm/pics/shutdown.jpg +debian/tmp/usr/share/apps/kdm/pics/users/default1.png +debian/tmp/usr/share/apps/kdm/pics/users/default2.png +debian/tmp/usr/share/apps/kdm/pics/users/default3.png +debian/tmp/usr/share/apps/kdm/pics/users/root1.png +debian/tmp/usr/share/apps/kdm/sessions/9wm.desktop +debian/tmp/usr/share/apps/kdm/sessions/aewm.desktop +debian/tmp/usr/share/apps/kdm/sessions/amaterus.desktop +debian/tmp/usr/share/apps/kdm/sessions/asclassic.desktop +debian/tmp/usr/share/apps/kdm/sessions/ctwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/evilwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/flwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/lwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/matchbox.desktop +debian/tmp/usr/share/apps/kdm/sessions/mwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/olvwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/olwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/oroborus.desktop +debian/tmp/usr/share/apps/kdm/sessions/pwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/twm.desktop +debian/tmp/usr/share/apps/kdm/sessions/ude.desktop +debian/tmp/usr/share/apps/kdm/sessions/vtwm.desktop +debian/tmp/usr/share/apps/kdm/sessions/wm2.desktop +debian/tmp/usr/share/apps/kdm/themes/circles/background.svg +debian/tmp/usr/share/apps/kdm/themes/circles/circles.xml +debian/tmp/usr/share/apps/kdm/themes/circles/flower.png +debian/tmp/usr/share/apps/kdm/themes/circles/GdmGreeterTheme.desktop +debian/tmp/usr/share/apps/kdm/themes/circles/help.png +debian/tmp/usr/share/apps/kdm/themes/circles/options.png +debian/tmp/usr/share/apps/kdm/themes/circles/screenshot.png +debian/tmp/usr/share/doc/kde/HTML/en/kdm/common +debian/tmp/usr/share/doc/kde/HTML/en/kdm/index.cache.bz2 +debian/tmp/usr/share/doc/kde/HTML/en/kdm/index.docbook +debian/tmp/usr/share/doc/kde/HTML/en/kdm/kdmrc-ref.docbook +debian/tmp/usr/share/doc/kdm/README --- kdebase-3.5.6.orig/debian/kdepasswd.manpages +++ kdebase-3.5.6/debian/kdepasswd.manpages @@ -0,0 +1 @@ +debian/man/kdepasswd.1 --- kdebase-3.5.6.orig/debian/kdm.prerm +++ kdebase-3.5.6/debian/kdm.prerm @@ -0,0 +1,175 @@ +#! /bin/sh +# prerm script for kdm +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# debconf may not be available if some massive purging is going on +HAVE_DEBCONF= +if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + HAVE_DEBCONF=yes +fi + +case "$1" in + # we NEVER want to unconditionally stop kdm; see below + upgrade|failed-upgrade) + REMOVING= + ;; + + remove|deconfigure) + REMOVING=yes + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +STOP= +# are we supposed to restart on upgrade? if REMOVING kdm, we don't care what +# the user says, we have to stop the daemon +if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options || + [ -n "$REMOVING" ]; then + # is there an kdm process running? + if start-stop-daemon --stop --quiet --signal 0 --name kdm; then + # any children? + PARENTS=$(pidof /usr/bin/kdm || true) + CHILDREN= + if [ -n "$PARENTS" ]; then + for PROCESS in $PARENTS; do + # make sure we got numbers back + [ $PROCESS -eq $PROCESS ] 2> /dev/null || + exit + # FIXME - redo this part uses shell-lib.sh from xfree86 + # die "pidof returned non-numeric value" + # we could use grep -q here if ps would ignore SIGPIPE :-P + if (ps axj | grep "^ *$PROCESS" > /dev/null 2>&1); then + CHILDREN=yes + fi + done + if [ -n "$CHILDREN" ]; then + if [ -n "$HAVE_DEBCONF" ]; then + # ask the question + db_input high kdm/stop_running_server_with_children || true + db_go + # what did the user say? + ANSWER= + if db_get kdm/stop_running_server_with_children; then + ANSWER="$RET" + fi + if [ "$ANSWER" = "true" ]; then + STOP=yes + fi + # forget that we have seen the question; this is the sort of + # non-configuration question that should be asked every time + db_fset kdm/stop_running_server_with_children seen false + fi + else + STOP=yes + fi + fi + fi +fi + +if [ -n "$STOP" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d kdm stop || true + else + /etc/init.d/kdm stop || true + fi +else + if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then + touch /var/run/kdm.upgrade + fi +fi + +DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager + +if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then + if [ -n "$HAVE_DEBCONF" ]; then + # disown this question + db_unregister shared/default-x-display-manager || true + # does the question still exist? + if db_get shared/default-x-display-manager; then + if db_metaget shared/default-x-display-manager owners; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #observe "X display managers now available are \"$OWNERS\"" + db_subst shared/default-x-display-manager choices "$RET" + fi + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + # are we removing the currently selected display manager? + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "kdm" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then + # does the display manager file reference the current default? if + # so, remove it because it will now be wrong + if [ -n "$RET" ]; then + if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then + rm "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + # ask the user to choose a new default + db_fset shared/default-x-display-manager seen false + db_input critical shared/default-x-display-manager || true + db_go + # if the default display manager file doesn't exist, write it with + # the path to the new default display manager + if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then + DEFAULT_DISPLAY_MANAGER= + if db_get shared/default-x-display-manager; then + DEFAULT_DISPLAY_MANAGER="$RET" + fi + if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "new default display manager has been selected; please be" \ + # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \ + # "is configured" + DAEMON_NAME= + if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then + DAEMON_NAME="$RET" + fi + if [ ! -n "$DAEMON_NAME" ]; then + # if we were unable to determine the name of the selected daemon (for + # instance, if the selected default display manager doesn't provide a + # daemon_name question), guess + DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null) + if [ ! -n "$DAEMON_NAME" ]; then + echo . + # FIXME - redo this part uses shell-lib.sh from xfree86 + #warn "unable to determine path to default X display manager" \ + # "$DEFAULT_DISPLAY_MANAGER; not updating" \ + # "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + if [ -n "$DAEMON_NAME" ]; then + echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE" + fi + fi + fi + fi + fi + fi + fi +fi + +exit 0 --- kdebase-3.5.6.orig/debian/kcontrol.preinst +++ kdebase-3.5.6/debian/kcontrol.preinst @@ -0,0 +1,24 @@ +#! /bin/sh -e + +case "$1" in + + upgrade) + rm -f /etc/kde3/kuriikwsfilterrc + ;; + + install) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/kdesktop.install +++ kdebase-3.5.6/debian/kdesktop.install @@ -0,0 +1,72 @@ +debian/tmp/etc/kde3/kdesktop_custom_menu1 +debian/tmp/etc/kde3/kdesktop_custom_menu2 +debian/tmp/usr/bin/kcheckrunning +debian/tmp/usr/bin/kdeeject +debian/tmp/usr/bin/kdesktop +debian/tmp/usr/bin/kdesktop_lock +debian/tmp/usr/bin/kwebdesktop +debian/tmp/usr/lib/kde3/kdesktop.la +debian/tmp/usr/lib/kde3/kdesktop.so +debian/tmp/usr/lib/libkdeinit_kdesktop.so +debian/tmp/usr/share/apps/kdesktop/DesktopLinks/Home.desktop usr/share/apps/kdesktop/unused/ +debian/tmp/usr/share/apps/kdesktop/DesktopLinks/System.desktop usr/share/apps/kdesktop/unused/ +debian/tmp/usr/share/apps/kdesktop/directory.autostart +debian/tmp/usr/share/apps/kdesktop/directory.desktop +debian/tmp/usr/share/apps/kdesktop/directory.templates +debian/tmp/usr/share/apps/kdesktop/directory.trash usr/share/apps/kdesktop/unused/ +debian/tmp/usr/share/apps/kdesktop/patterns/fish.desktop +debian/tmp/usr/share/apps/kdesktop/patterns/fish.png +debian/tmp/usr/share/apps/kdesktop/patterns/flowers.desktop +debian/tmp/usr/share/apps/kdesktop/patterns/flowers.png +debian/tmp/usr/share/apps/kdesktop/patterns/night-rock.desktop +debian/tmp/usr/share/apps/kdesktop/patterns/night-rock.jpg +debian/tmp/usr/share/apps/kdesktop/patterns/pavement.desktop +debian/tmp/usr/share/apps/kdesktop/patterns/pavement.png +debian/tmp/usr/share/apps/kdesktop/patterns/rattan.desktop +debian/tmp/usr/share/apps/kdesktop/patterns/rattan.png +debian/tmp/usr/share/apps/kdesktop/patterns/stonewall2.desktop +debian/tmp/usr/share/apps/kdesktop/patterns/stonewall2.png +debian/tmp/usr/share/apps/kdesktop/patterns/triangles.desktop +debian/tmp/usr/share/apps/kdesktop/patterns/triangles.png +debian/tmp/usr/share/apps/kdesktop/pics/kde2.xbm +debian/tmp/usr/share/apps/kdesktop/pics/ksslogo.png +debian/tmp/usr/share/apps/kdesktop/pics/splash2.png +debian/tmp/usr/share/apps/kdesktop/pics/splash.png +debian/tmp/usr/share/apps/kdesktop/programs/kwebdesktop.desktop +debian/tmp/usr/share/apps/kdesktop/programs/xearth.desktop +debian/tmp/usr/share/apps/kdesktop/programs/xglobe.desktop +debian/tmp/usr/share/apps/kdesktop/programs/xplanet.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop +debian/tmp/usr/share/autostart/kdesktop.desktop +debian/tmp/usr/share/config.kcfg/kdesktop.kcfg +debian/tmp/usr/share/config.kcfg/klaunch.kcfg +debian/tmp/usr/share/config.kcfg/kwebdesktop.kcfg +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/error.png +debian/tmp/usr/share/templates/Directory.desktop +debian/tmp/usr/share/templates/HTMLFile.desktop +debian/tmp/usr/share/templates/linkCAMERA.desktop +debian/tmp/usr/share/templates/linkCDROM.desktop +debian/tmp/usr/share/templates/linkCDWRITER.desktop +debian/tmp/usr/share/templates/linkDVDROM.desktop +debian/tmp/usr/share/templates/linkFloppy.desktop +debian/tmp/usr/share/templates/linkHD.desktop +debian/tmp/usr/share/templates/linkMO.desktop +debian/tmp/usr/share/templates/linkNFS.desktop +debian/tmp/usr/share/templates/linkProgram.desktop +debian/tmp/usr/share/templates/linkURL.desktop +debian/tmp/usr/share/templates/linkZIP.desktop +debian/tmp/usr/share/templates/.source/CAMERA-Device.desktop +debian/tmp/usr/share/templates/.source/CDROM-Device.desktop +debian/tmp/usr/share/templates/.source/CDWRITER-Device.desktop +debian/tmp/usr/share/templates/.source/DVDROM-Device.desktop +debian/tmp/usr/share/templates/.source/emptydir +debian/tmp/usr/share/templates/.source/Floppy.desktop +debian/tmp/usr/share/templates/.source/HD.desktop +debian/tmp/usr/share/templates/.source/HTMLFile.html +debian/tmp/usr/share/templates/.source/MO-Device.desktop +debian/tmp/usr/share/templates/.source/NFS.desktop +debian/tmp/usr/share/templates/.source/Program.desktop +debian/tmp/usr/share/templates/.source/TextFile.txt +debian/tmp/usr/share/templates/.source/URL.desktop +debian/tmp/usr/share/templates/.source/ZIP-Device.desktop +debian/tmp/usr/share/templates/TextFile.desktop --- kdebase-3.5.6.orig/debian/ksmserver.install +++ kdebase-3.5.6/debian/ksmserver.install @@ -0,0 +1,9 @@ +debian/tmp/usr/bin/ksmserver +debian/tmp/usr/bin/startkde +debian/tmp/usr/lib/kde3/ksmserver.la +debian/tmp/usr/lib/kde3/ksmserver.so +debian/tmp/usr/lib/libkdeinit_ksmserver.so +debian/tmp/usr/share/apps/kconf_update/ksmserver.upd +debian/tmp/usr/share/apps/kconf_update/move_session_config.sh +debian/tmp/usr/share/apps/kdm/sessions/kde.desktop usr/share/xsessions/ +debian/tmp/usr/share/apps/ksmserver/pics/shutdownkonq.png --- kdebase-3.5.6.orig/debian/kdebase-data.preinst +++ kdebase-3.5.6/debian/kdebase-data.preinst @@ -0,0 +1,55 @@ +#! /bin/sh -e + +FILE="/etc/xdg/menus/applications-merged/kde-essential.menu" +SUBDIR="/etc/xdg/menus/applications-merged" + +case "$1" in + + upgrade) + rm -f /etc/kde3/debian/d-adventure.desktop + rm -f /etc/kde3/debian/d-arcade.desktop + rm -f /etc/kde3/debian/d-board.desktop + rm -f /etc/kde3/debian/d-card.desktop + rm -f /etc/kde3/debian/d-databases.desktop + rm -f /etc/kde3/debian/d-debian.desktop + rm -f /etc/kde3/debian/d-emulators.desktop + rm -f /etc/kde3/debian/d-hamradio.desktop + rm -f /etc/kde3/debian/d-help.desktop + rm -f /etc/kde3/debian/d-lock.desktop + rm -f /etc/kde3/debian/d-math.desktop + rm -f /etc/kde3/debian/d-modules.desktop + rm -f /etc/kde3/debian/d-puzzles.desktop + rm -f /etc/kde3/debian/d-root-window.desktop + rm -f /etc/kde3/debian/d-save.desktop + rm -f /etc/kde3/debian/d-screen.desktop + rm -f /etc/kde3/debian/d-shells.desktop + rm -f /etc/kde3/debian/d-sports.desktop + rm -f /etc/kde3/debian/d-strategy.desktop + rm -f /etc/kde3/debian/d-technical.desktop + rm -f /etc/kde3/debian/d-tetris-like.desktop + rm -f /etc/kde3/debian/d-text.desktop + rm -f /etc/kde3/debian/d-toys.desktop + rm -f /etc/kde3/debian/d-viewers.desktop + rm -f /etc/kde3/debian/d-window-managers.desktop + rm -f /etc/kde3/debian/d-xshells.desktop + + [ -f "$FILE" ] || exit 0 + if dpkg --compare-versions "$2" lt "4:3.4.0-0pre4"; then + rm -f "$FILE" + rmdir --ignore-fail-on-non-empty "$SUBDIR" + fi + ;; + + install|abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.kdeprint +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.kdeprint @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-kdeprint +Title: KDEPrint Handbook +Author: Kurt Pfeifle +Abstract: KDEPrint is the official printing system of KDE. +Section: Apps/Tools + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kdeprint/index.html +Files: /usr/share/doc/kde/HTML/en/kdeprint/*.html + --- kdebase-3.5.6.orig/debian/kappfinder.install +++ kdebase-3.5.6/debian/kappfinder.install @@ -0,0 +1,223 @@ +debian/tmp/usr/bin/kappfinder +debian/tmp/usr/share/applications/kde/kappfinder.desktop +debian/tmp/usr/share/applnk/System/kappfinder.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/wireshark.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/assistant.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/ddd.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/designer.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/dlgedit.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/eclipse.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/Forte.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/j2mewtk.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/linguist.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Development/pose.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/alephone.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/GnobotsII.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/Mures.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/Trophy.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/TuxRacer.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/XKobo.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gataxx.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gchess.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Glines.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gmahjongg.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gmines.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gnotravex.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gnotski.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gstones.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Iagno.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/SameGnome.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/xboard.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Xgammon.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/AisleRiot.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/FreeCell.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/PySol.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/XPat2.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Clanbomber.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/defendguin.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/GTali.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/penguin-command.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/angband.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/moria.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/nethack.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/rogue.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/tome.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Toys/xeyes.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/Toys/xpinguin.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Games/xshipwars.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/bitmap.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/blender.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/ElectricEyes.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/ghostview.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/gimp.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/GPhoto.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Gqview.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/gv.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/inkscape.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Sketch.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/sodipodi.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/tgif.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xdvi.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xfig.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xpaint.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Xpcd.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xv.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Xwpick.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/arena.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/balsa.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/BlueFish.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/btdownloadgui.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/coolmail.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/dc_gui.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Dpsftp.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/DrakSync.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/ed2k_gui.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/epiphany.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/ethereal.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Evolution.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Faces.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Fetchmailconf.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Gabber.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/gaim.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Galeon.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/gFTP.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/GnomeICU.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/gnomemeeting.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/gnometalk.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/gtelnet.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/ickle.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/javaws.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/knews.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/licq.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/mldonkey_gui.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/mozilla.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/mozilla-firefox.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/netscape6.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/netscape.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Netscapemessenger.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Nmapfe.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/opera.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Pan.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Sylpheed.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/lftp.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/Links.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/mutt.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/pine.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/silc.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/slrn.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/w3m.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/xbiff.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/xchat.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/xfmail.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Internet/xftp.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/alevt.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/audacity.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/Aumix.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/aviplay.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/bcast2000.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/Grip.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/gtv.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/jazz.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/MP3info.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/mplayer.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/mtv.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ogle.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/realplayer.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/rezound.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/slab.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/sweep.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xawtv.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xcam.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xine.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xmms.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/XMovie.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/abiword.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/acroread.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/Applix.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/Dia.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/Gnome-Cal.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/Gnome-Card.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/GnomeTimeTracker.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/gnucash.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/Gnumeric.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/Guppi.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/Ical.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/mrproject.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/netscapeaddressbook.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/plan.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/pybliographic.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/scribus.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/WordPerfect2000.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/WordPerfect.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/XAcc.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/xpdf.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Office/XsLite.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/citrix_ica.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/editres.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/sam.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/aterm.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/procinfo.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/rxvt.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/vmstat.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/wine.desktop +debian/tmp/usr/share/apps/kappfinder/apps/System/xosview.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/calctool.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/emacs.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/gedit.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/gvim.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/lemacs.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/nano.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/nedit.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/pico.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/xedit.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/xemacs.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/e-notes.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/GKrellM.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/GnomeWho.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/oclock.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/SystemInfo.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/xgnokii.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xkill.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop +debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop +debian/tmp/usr/share/doc/kde/HTML/en/kappfinder/man-kappfinder.1.docbook +debian/tmp/usr/share/icons/hicolor/128x128/apps/kappfinder.png +debian/tmp/usr/share/icons/hicolor/16x16/apps/kappfinder.png +debian/tmp/usr/share/icons/hicolor/22x22/apps/kappfinder.png +debian/tmp/usr/share/icons/hicolor/32x32/apps/kappfinder.png +debian/tmp/usr/share/icons/hicolor/48x48/apps/kappfinder.png +debian/tmp/usr/share/icons/hicolor/64x64/apps/kappfinder.png + +debian/icons/kappfinder.xpm /usr/share/pixmaps +debian/icons/kappfinder-16.xpm /usr/share/pixmaps --- kdebase-3.5.6.orig/debian/kcheckpass.pam +++ kdebase-3.5.6/debian/kcheckpass.pam @@ -0,0 +1,7 @@ +# +# /etc/pam.d/kcheckpass - specify the PAM behaviour of kcheckpass +# +@include common-auth +@include common-account +@include common-password +@include common-session --- kdebase-3.5.6.orig/debian/man/kdesu.1 +++ kdebase-3.5.6/debian/man/kdesu.1 @@ -0,0 +1,90 @@ +.TH KDESU 1 "May 2005" "K Desktop Environment" "Runs a program with elevated privileges." +.SH NAME +kdesu \- Runs a program with elevated privileges. +.SH SYNOPSIS +\fBkdesu\fR [Qt\-options] [KDE\-options] [kdesu options] command +.SH DESCRIPTION +Runs a program with elevated privileges. +.PP +KDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges. +.PP +\fBkdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBkdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBkdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBkdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security. +.SH OPTIONS +.SS Generic options: +.TP +.B --help +Show help about options +.TP +.B --help-qt +Show Qt specific options +.TP +.B --help-kde +Show KDE specific options +.TP +.B --help-all +Show all options +.TP +.B --author +Show author information +.TP +.B -v, --version +Show version information +.TP +.B --license +Show license information +.SS +.SS kdesu Options: +.TP +.TP +.B -c +Specifies the command to run +.TP +.B -f +Run command under target uid if is not writable +.TP +.B -u +Specifies the target uid [default is root] +.TP +.B -n +Do not keep password +.TP +.B -s +Stop the daemon (forgets all passwords) +.TP +.B -t +Enable terminal output (no password keeping) +.TP +.B -p +Set priority value: 0 <= prio <= 100, 0 is lowest [default is 50] +.TP +.B -r +Use realtime scheduling +.TP +.B --nonewdcop +Let command use existing dcopserver +.TP +.B -i +Specify icon to use in the password dialog +.TP +.B -d +Do not show the command to be run in the dialog +.SS +.SS Arguments: +.TP +.B command +Specifies the command to run + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kdesu/ +directly into konqueror or you can run +.BR "`khelpcenter help:/kdesu/'" +from the command-line. +.br +.SH AUTHORS +.br +Geert Jansen +.br +Pietro Iglio +.PP +This manual page was written by Christopher Martin for Debian GNU/Linux, but may be used by others. It borrows from an earlier manpage by Karolina Lindqvist . --- kdebase-3.5.6.orig/debian/man/kreadconfig.1 +++ kdebase-3.5.6/debian/man/kreadconfig.1 @@ -0,0 +1,173 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read KConfig entries" +.SH NAME +kreadconfig +\- Read KConfig entries (for use in shell scripts) +.SH SYNOPSIS +\fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBkreadconfig\fP is a command line tool to retrieve values from KDE configuration files. +.sp 1 +If a file given via option \fB\-\-file\fP does not contain a path the KDE standard configuration directory is used. +.SS Example: +.TP +\fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp +read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from KDE's main configuration file + +.SH OPTIONS +.SS Options: +.TP +.B \-\-file +Use instead of global config +.TP +.B \-\-group +Group to look in [KDE] +.TP +.B \-\-key +Key to look for +.TP +.B \-\-default +Default value +.TP +.B \-\-type +Type of variable +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display +Use the X-server display 'displayname' +.TP +.B \-\-session +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font +defines the application font +.TP +.B \-\-bg, \-\-background +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground +sets the default foreground color +.TP +.B \-\-btn, \-\-button +sets the default button color +.TP +.B \-\-name +sets the application name +.TP +.B \-\-title +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH FILES +.I /etc/kde3/system.kdeglobals +global KDE configuration file +.I ~/.kde/share/config +standard configuration directory + +.SH AUTHORS +.nf +Bernhard Rosenkraenzer <bero@redhat.com> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/startkde.1 +++ kdebase-3.5.6/debian/man/startkde.1 @@ -0,0 +1,46 @@ +.TH startkde 1 "Jan 17, 2005" +.SH NAME +startkde \- Starts up the KDE Desktop Environment +.SH SYNOPSIS +.B startkde +.br +.SH DESCRIPTION +This manual page documents briefly the +.B startkde +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +The \fBstartkde\fP script starts up the K Desktop Environment and +is typicaly executed by your login manager (e.g. xdm, gdm, kdm, wdm or from +your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which +will load your last session, or a default session that includes the standard +KDE programs if no saved session is available. + +\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage +any X11R6 SM compliant program. + +\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory +for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh +can be used to define environment variables that will be available to all KDE +programs. + +For anything else (that doesn't set env vars, or that needs a window manager), +better use the ~/.kde/Autostart folder. + +At the end of a session, the scripts found in ~/.kde/shutdown will be executed. + + +.SH OPTIONS +\fBstartkde\fP takes no command line options. + +.SH AUTHOR +\fBstartkde\fP is written by the KDE Project. + +This manual page was written by Philipp Grau. + +.SH "REPORTING BUGS" +Report bugs of this modified Debian version of startkde to the Bug +Tracking System at: http://bugs.debian.org +.SH COPYRIGHT +Copyright \(co 2005 Philipp Grau. --- kdebase-3.5.6.orig/debian/man/extensionproxy.1 +++ kdebase-3.5.6/debian/man/extensionproxy.1 @@ -0,0 +1,163 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH EXTENSIONPROXY 1 "June 2006" "K Desktop Environment" "Panel extension proxy" +.SH NAME +extensionproxy +\- KDE kicker panel extension proxy +.SH SYNOPSIS +\fBextensionproxy\fP [Qt\-options] [KDE\-options] \fIdesktopfile\fP +.SH DESCRIPTION +\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B desktopfile +The extension's desktop file +.SS +.SS Options: +.TP +.B \-\-configfile <file> +The config file to be used +.TP +.B \-\-callbackid <id> +DCOP callback id of the extension container +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH FILES +\fI/usr/share/apps/kicker/extensions\fP +kicker extensions directory +.SH SEE ALSO +\fBkicker\fP(1), \fBappletproxy\fP(1) +.SH AUTHORS +.nf +Matthias Elter <elter@kde.org> +.br +Matthias Ettrich <ettrich@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kxkb.1 +++ kdebase-3.5.6/debian/man/kxkb.1 @@ -0,0 +1,163 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KXKB 1 "June 2006" "K Desktop Environment" "A utility to switch keyboard maps" +.SH NAME +kxkb +\- A utility to switch keyboard maps +.SH SYNOPSIS +\fBkxkb\fP [Qt\-options] [KDE\-options] +.SH DESCRIPTION +\fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator. +.sp 1 +\fBKxkb\fP starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or Show indicator for single layout option is turned on. +.sp 1 +When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list. +.sp 1 +Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBkcmshell keyboard_layout\fP in a terminal. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.TP +.B \-\-nofork +Don't run in the background. + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kxkb/ +directly into konqueror or you can run +.BR "khelpcenter help:/kxkb/" +from the command\-line. +.br +.SH AUTHORS +.nf +Andriy Rysin <rysin@kde.org> +.br +Shaheed Haque <srhaque@iee.org> +.br +Ilya Konstantinov <kde\-devel@future.galanet.net> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/konsole.1 +++ kdebase-3.5.6/debian/man/konsole.1 @@ -0,0 +1,175 @@ +.\" The draft of this file was generated by kdemangen.pl and edited after. +.TH Konsole 1 "Nov 2005" "K Desktop Environment" "" +.SH NAME +.BR Konsole +\- X terminal emulator for KDE. +.SH SYNOPSIS +.BR Konsole +[Qt\-options] [KDE\-options] [options] [args] +.SH DESCRIPTION +Konsole is an X terminal emulation which provides a command-line interface +(CLI) while using the graphical K Desktop Environment. Konsole helps to +better organize user's desktop by containing multiple sessions in a single +window (a less cluttered desktop). +.PP +Konsole advanced features include simple configuration and the ability to use +multiple terminal shells in a single window, making for a less +cluttered desktop. +.PP +Using Konsole, a user can open: +.PP +.RS +Linux console sessions +.PP +Shell sessions +.PP +Screen sessions +.PP +Midnight Commander file manager sessions +.PP +Root console sessions +.PP +Root Midnight Commander sessions +.PP +User created sessions +.RE + +These sessions can be renamed to help you keep track of all your shells, +or signaled (STOP, CONT, HUP, INT, TERM, KILL). +.PP +For more control over konsole, a user can: +hide/show the menubar and/or frame; +select the size of a konsole window, fonts, color +schemes, and key mapping; +change location of the scrollbar or hide the scrollbar; +change location of the tabbar or hide the tabbar. +.PP +All chosen settings can be made the default for forthcoming sessions by +saving them. +.SH OPTIONS +.SS +.SS Konsole specific options: +.TP +.B \-\-name <name> +Set window class +.TP +.B \-\-ls +Start login shell +.B \-T <title> +Set the window title +.TP +.B \-\-tn <terminal> +Specify terminal type as set in the TERM [xterm] +environment variable +.TP +.B \-\-noclose +Do not close Konsole when command exits +.TP +.B \-\-nohist +Do not save lines in history +.TP +.B \-\-nomenubar +Do not display menubar +.TP +.B \-\-notabbar, \-\-notoolbar +Do not display tab bar +.TP +.B \-\-noframe +Do not display frame +.TP +.B \-\-noscrollbar +Do not display scrollbar +.TP +.B \-\-noxft +Do not use Xft (anti-aliasing) +.TP +.B \-\-vt_sz CCxLL +Terminal size in columns x lines +.TP +.B \-\-noresize +Terminal size is fixed +.TP +.B \-\-type <type> +Start with given session type +.TP +.B \-\-types +List available session types +.TP +.B \-\-keytab <name> +Set keytab to 'name' +.TP +.B \-\-keytabs +List available keytabs +.TP +.B \-\-profile <name> +Start with given session profile +.TP +.B \-\-profiles +List available session profiles +.TP +.B \-\-schema <name> +| <file> Set schema to 'name' or use 'file' +.TP +.B \-\-schemas, \-\-schemata +List available schemata +.TP +.B \-\-script +Enable extended DCOP Qt functions +.TP +.B \-\-workdir <dir> +Change working directory to 'dir' +.B \-e <command> +Execute 'command' instead of shell +.SS +.SS Arguments: +.TP +.B args +Arguments for 'command' +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/konsole/ +directly into konqueror or you can run +.BR "`khelpcenter help:/konsole/'" +from the command-line. +.BR + +Konsole homepage: +.BR http://konsole.kde.org/ +.SH AUTHORS +Kurt V. Hindenburg <kurt.hindenburg@kdemail.net> + +Lars Doelle <lars.doelle@on-line.de> +.BR +.SH OTHER +This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org> for the Debian +system (but may be used by others). +.BR + --- kdebase-3.5.6.orig/debian/man/kasbar.1 +++ kdebase-3.5.6/debian/man/kasbar.1 @@ -0,0 +1,148 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KASBAR 1 "June 2006" "K Desktop Environment" "An alternative task manager" +.SH NAME +kasbar +\- An alternative task manager +.SH SYNOPSIS +\fBkasbar\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded. +.SH OPTIONS +.SS Options: +.TP +.B \-\-test +Test the basic kasbar code +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH SEE ALSO +\fBkicker\fP(1) +.SH AUTHORS +.nf + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/appletproxy.1 +++ kdebase-3.5.6/debian/man/appletproxy.1 @@ -0,0 +1,163 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH APPLETPROXY 1 "June 2006" "K Desktop Environment" "Panel applet proxy" +.SH NAME +appletproxy +\- KDE kicker panel applet proxy +.SH SYNOPSIS +\fBappletproxy\fP [Qt\-options] [KDE\-options] \fIdesktopfile\fP +.SH DESCRIPTION +\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B desktopfile +The applet's desktop file +.SS +.SS Options: +.TP +.B \-\-configfile <file> +The config file to be used +.TP +.B \-\-callbackid <id> +DCOP callback id of the applet container +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH FILES +\fI/usr/share/apps/kicker/applets\fP +kicker applets directory +.SH SEE ALSO +\fBkicker\fP(1), \fBextensionproxy\fP(1) +.SH AUTHORS +.nf +Matthias Elter <elter@kde.org> +.br +Matthias Ettrich <ettrich@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kdm.1 +++ kdebase-3.5.6/debian/man/kdm.1 @@ -0,0 +1,116 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" +.SH NAME +kdm +\- KDE Display Manager +.SH SYNOPSIS +\fBkdm\fP [options] [tty] +.SH DESCRIPTION +\fBkdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. +.br +\fBkdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. +.sp 1 +\fBkdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. +.SH OPTIONS +.TP +.B \-daemon +Daemonize even when started by init +.TP +.B \-nodaemon +Don't daemonize even when started from command line +.TP +.BI \-config\ file +Use alternative master configuration file +.TP +.BR \-xrm \ res +Override frontend\-specific resource +.TP +.BI \-error\ file +Use alternative log file +.TP +.BR \-debug \ num +Debug option bitfield: +.RS 11 +0x1 \- core log +.br +0x2 \- config reader log +.br +0x4 \- greeter log +.br +0x8 \- IPC log +.br +0x10 \- session sub-daemon post-fork delay +.br +0x20 \- config reader post-start delay +.br +0x40 \- greeter post-start delay +.br +0x80 \- don't use syslog +.br +0x100 \- core Xauth log +.br +0x400 \- valgrind config reader and greeter +.br +0x800 \- strace config reader and greeter +.RE +.SH FILES +.TP +.I /etc/kde3/kdm/backgroundrc +configuration file with background settings +.TP +.I /etc/kde3/kdm/kdm.options +options for X display manager kdm +.TP +.I /etc/kde3/kdm/kdmrc +the kdm configuration file +.TP +.I /etc/kde3/kdm/Xaccess +access control file for XDMCP connections +.TP +.I /etc/kde3/kdm/Xservers +list of local X-servers +.TP +.I /etc/kde3/kdm/Xreset +script to run as root after session exits +.TP +.I /etc/kde3/kdm/Xsession +script to run as user after login of user +.TP +.I /etc/kde3/kdm/Xsetup +script to run as root before the login dialog appears +.sp 1 +this script can be edited to disable or modify the running of \fBxconsole\fP on the kdm greeter screen +.TP +.I /etc/kde3/kdm/Xstartup +script to run as root before session starts +.TP +.I /etc/kde3/kdm/Xwilling +output of this script is displayed in the chooser window +.SH SEE ALSO +.BR kdm.options (5),\ kdmctl (1),\ kdm_config (1),\ kdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) +.TP +.I /usr/share/doc/kdm/README.gz +Information about \fBkdm\fP and its options +.sp 1 +.RE +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kdm/ +directly into konqueror or you can run +.BR "khelpcenter help:/kdm/" +from the command\-line. +.br +.SH AUTHORS +.nf +Steffen Hansen <hansen@kde.org> +.br +Thomas Tanghus <tanghus@earthling.net> +.br +Oswald Buddenhagen <ossi@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kdebugdialog.1 +++ kdebase-3.5.6/debian/man/kdebugdialog.1 @@ -0,0 +1,200 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDEBUGDIALOG 1 "June 2006" "K Desktop Environment" "control debug output" +.SH NAME +kdebugdialog +\- A dialog box for setting preferences for debug output +.SH SYNOPSIS +\fBkdebugdialog\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBKDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime. +.sp 1 +If you simply start \fBkdebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled. +.sp 1 +If you start \fBkdebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area. +.sp 1 +In full mode, first you should select the debug area you are interested in from the drop down list at the top. +.sp 1 +You may independently set the output for various types of messages: +.sp 1 +.RS 3 +\- Information +.br +\- Warning +.br +\- Error +.br +\- Fatal Error +.RE +.PP +For each of these types, you can set the following: +.sp 1 +\fBOutput to\fP: +.br +In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?. +.sp 1 +\fBFilename:\fP +.br +This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP. +Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level KDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message. +.sp 1 +When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored. + +.SH OPTIONS +.SS Options: +.TP +.B \-\-fullmode +Show the fully\-fledged dialog instead of the default list dialog +.TP +.B \-\-on <area> +Turn area on +.TP +.B \-\-off <area> +Turn area off +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.TP +.B \-\-nofork +Don't run in the background. +.SS + +.SH FILES +.I ~/.kde/share/config/kdebugrc +\fBkdebugdialog\fP configuration file + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kdebugdialog/ +directly into konqueror or you can run +.BR "khelpcenter help:/kdebugdialog/" +from the command\-line. +.br +.SH AUTHORS +.nf +David Faure <faure@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/knetattach.1 +++ kdebase-3.5.6/debian/man/knetattach.1 @@ -0,0 +1,164 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KNETATTACH 1 "June 2006" "K Desktop Environment" "KDE Network Wizard" +.SH NAME +knetattach +\- KDE Network Wizard +.SH SYNOPSIS +\fBknetattach\fP [Qt\-options] [KDE\-options] +.SH DESCRIPTION +The \fBKDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your KDE Desktop. +.sp 1 +The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your KDE desktop. +.sp 1 +The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders: +.br +.RS 3 +\- WebDav +.br +\- FTP +.br +\- Microsoft(R) Windows(R) (Samba) network drives +.br +\- SSH +.RE +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/knetattach/ +directly into konqueror or you can run +.BR "khelpcenter help:/knetattach/" +from the command\-line. +.br +.SH AUTHORS +.nf +George Staikos <staikos@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kdm_config.1 +++ kdebase-3.5.6/debian/man/kdm_config.1 @@ -0,0 +1,22 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" +.SH NAME +kdm_config +\- helper programm for kdm to read configuration files +.SH SYNOPSIS +\fBkdm_config\fP +.SH DESCRIPTION +\fBkdm_config\fP is a helper program for \fBkdm\fP to read configuration files. +.SH SEE ALSO +\fBkdm\fP(1) +.SH AUTHORS +.nf +Oswald Buddenhagen <ossi@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kprinter.1 +++ kdebase-3.5.6/debian/man/kprinter.1 @@ -0,0 +1,207 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KPRINTER 1 "June 2006" "K Desktop Environment" "A printer tool for KDE" +.SH NAME +kprinter +\- a printer tool for KDE +.SH SYNOPSIS +\fBkprinter\fP [Qt\-options] [KDE\-options] [options] file(s) +.SH DESCRIPTION +\fBKPrinter\fP opens automatically when you click on the "Print" icon of any KDE application. Choose your print job settings by going through the dialog and the click on the "Print" button. +.sp 1 +\fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape. +.sp 1 +With \fBKPrinter\fP you can... +.IP " \-" +switch "on the fly" the print subsystem\-to\-use, +.IP " \-" +start the Add Printer Wizard, +.IP " \-" +choose the target printer, +.IP " \-" +possibly select one or more files to print, +.IP " \-" +drag'n'drop files for print, +.IP " \-" +check for or set the print options, +.IP " \-" +schedule the job for later printing, +.IP " \-" +tag the print job with accounting information for billing purposes, +.IP " \-" +set the job priority for a higher or lower level to influence the order of the job queue, +.IP " \-" +access the KDEPrint configurator, +.IP " \-" +and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user. +.SP +.SH OPTIONS +.SS +.SS Arguments: +file(s) Files to load +.SS Options: +.TP +.B \-c +Make an internal copy of the files to print +.TP +.B \-P, \-d <printer> +Printer/destination to print on +.TP +.B \-J, \-t <title> +Title/Name for the print job +\-#, \-n <number> Number of copies +.TP +.B \-o +<option=value> Printer option +.TP +.B \-j <mode> +Job output mode (gui, console, none) [gui] +.TP +.B \-\-system <printsys> +Print system to use (lpd, cups) +.TP +.B \-\-stdin +Allow printing from STDIN +.TP +.B \-\-nodialog +Do not show the print dialog (print directly) +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kprinter/ +directly into konqueror or you can run +.BR "khelpcenter help:/kprinter/" +from the command\-line. +.br +.SH AUTHORS +.nf +Michael Goffioul <kdeprint@swing.be> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kjobviewer.1 +++ kdebase-3.5.6/debian/man/kjobviewer.1 @@ -0,0 +1,202 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KJOBVIEWER 1 "June 2006" "K Desktop Environment" "A print job viewer" +.SH NAME +kjobviewer +\- a print job viewer +.SH SYNOPSIS +\fBkjobviewer\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways. +.sp 1 +The details are, again, as with all other modules of \fBKDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server". +.sp 1 +With kjobviewer you can... +.IP " \-" +see an overview for a certain queue or see all jobs on all queues; +.IP " \-" +filter the list to see your "own" jobs only; +.IP " \-" +sort the pending jobs according to different criteria (size, ownership, job\-ide, job\-name; billing\-tags); +.IP " \-" +stop a job from printing, putting it into a "held" state; +.IP " \-" +re\-start a held job; +.IP " \-" +manually release a job that was sent to "hold" from the client already; +.IP " \-" +reschedule a job for printing at a specified time; +.IP " \-" +increase or decrease the job\-priorities (allowed values are 1\-100) to re-arrange the order of automatic printing; +.IP " \-" +move a job to a different print\-queue; +.IP " \-" +stop jobs from leaving the queue (while still accepting incoming ones); +.IP " \-" +reject new incoming jobs (while still printing all the pending ones until the queue is empty); +.IP " \-" +check and re\-set all job options \-\- even adapt them to another target printet which might have a complete different set of commands; +.IP " \-" +view the existing and re\-assign a new job\-billing tag to a job; +.IP " \-" +pop up on screen a nicely formatted report of IPP attributes for any job and also print it; +.IP " \-" +increase or decrease the number of required copies; +.IP " \-" +cancel and delete a no-longer\-required job. +.PP +Note, that some of these manipulations require job ownership or root access. +.SH OPTIONS +.SS Options: +.TP +.B \-d +<printer\-name> The printer for which jobs are requested +.TP +.B \-\-noshow +Show job viewer at startup +.TP +.B \-\-all +Show jobs for all printers +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.TP +.B \-\-nofork +Don't run in the background. +.SS + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kjobviewer/ +directly into konqueror or you can run +.BR "khelpcenter help:/kjobviewer/" +from the command\-line. +.br +.SH AUTHORS +.nf +Michael Goffioul <kdeprint@swing.be> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/ktrash.1 +++ kdebase-3.5.6/debian/man/ktrash.1 @@ -0,0 +1,155 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KTRASH 1 "June 2006" "K Desktop Environment" "helper program" +.SH NAME +ktrash +\- Helper program to handle the KDE trash can +.SH SYNOPSIS +\fBktrash\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBktrash\fP is a helper program to handle the KDE trash can. +.sp 1 +Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/" +.SH OPTIONS +.SS +.SS Options: +.TP +.B \-\-empty +Empty the contents of the trash +.TP +.B \-\-restore <file> +Restore a trashed file to its original location +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH SEE ALSO +\fBkfmclient\fP(1) +.SH AUTHORS +.nf +David Faure <faure@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kwrite.1 +++ kdebase-3.5.6/debian/man/kwrite.1 @@ -0,0 +1,60 @@ +.TH KWRITE 1 "August, 25 2003" +.SH NAME +kwrite \- KDE text editor +.SH SYNOPSIS +.B kwrite +.RI [ options ] [file] +.SH DESCRIPTION +This manual page documents briefly the +.B kwrite +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkwrite\fP is a text editor for KDE, that is a light version of \fIkate\fP. +It allows syntax coloration for many langages. + +It is able to expand or collapse parts of code (C functions, ...). + +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-\-help +Show summary of options. +.TP +.B \-\-help\-qt +Show QT specific help (common for all QT apps). +.TP +.B \-\-help\-kde +Show KDE specific help (common for all KDE apps). +.TP +.B \-\-help\-all +Show the complete help. +.TP +.B \-\-author +Show program author(s). +.TP +.B \-\-license +Show program license. +.TP +.B \-v, \-\-version +Show version of program. + +.B file +is the file to open + +.SH SEE ALSO +.BR kate (1) +.PP +For more details, you should have a look at the KDE Help center, available +from the K menu. +.SH AUTHOR +This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, +for the Debian GNU/Linux project (but may be used by others). +.PP +kwrite was written by the KDE project --- kdebase-3.5.6.orig/debian/man/genkdmconf.1 +++ kdebase-3.5.6/debian/man/genkdmconf.1 @@ -0,0 +1,91 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH GENKDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for kdm" +.SH NAME +genkdmconf +\- generate configuration files for kdm +.SH SYNOPSIS +\fBgenkdmconf\fP +.RB [ \-\-in +.IR /path/to/new/kdm\-config\-dir ] +.RS 11 +.RB [ \-\-old\-xdm +.IR /path/to/old/xdm\-dir ] +.br +.RB [ \-\-old\-kde +.IR /path/to/old/kde\-config\-dir ] +.br +.RB [ \-\-no\-old ] +.RB [ \-\-no\-old\-xdm ] +.RB [ \-\-no\-old\-kde ] +.RB [ \-\-old\-scripts ] +.br +.RB [ \-\-no\-old\-scripts ] +.RB [ \-\-old\-confs ] +.RB [ \-\-no\-backup ] +.br +.RB [ \-\-no\-in\-notice ] +.RE + +.SH DESCRIPTION +\fBgenkdmconf\fP is used to generate configuration files for \fBkdm\fP. +.br +If an older xdm/kdm configuration is found, its config files are "absorbed"; +if it lives in the new target directory, its scripts are reused (and possibly +modified) as well, otherwise the scripts are ignored and default scripts are +installed. +.SH OPTIONS +.TP +.BI \-\-in \ /path/to/new/kdm\-config\-dir +In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected. +.br +Default is \fI/etc/kde3/kdm\fP. +.TP +.BI \-\-old\-xdm \ /path/to/old/xdm\-dir +Where to look for the config files of an \fBxdm\fP / older \fBkdm\fP. Default is to scan +.IR /etc/X11/kdm , \ $XLIBDIR/kdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; +there in turn look for \fIkdm\-config\fP and \fIxdm\-config\fP. +.br +Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect. +.TP +.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir +Where to look for the \fIkdmrc\fP of an older \fBkdm\fP. +.br +.RI Default\ is\ to\ scan\ /etc/kde3 \ and\ { /usr,/usr/local , +.RI { /opt,/usr/local }{ kde3,kde,kde2,kde1 }} /share/config . +.TP +.B \-\-no\-old +Don't look at older xdm/kdm configurations, just create default config. +.TP +.B \-\-no\-old\-xdm +Don't look at older xdm configurations. +.TP +.B \-\-no\-old\-kde +Don't look at older kdm configurations. +.TP +.B \-\-old\-scripts +Directly use all scripts from the older xdm/kdm configuration. +.TP +.B \-\-no\-old\-scripts +Don't use scripts from the older xdm/kdm configuration even if it lives in the new target directory. +.TP +.B \-\-old\-confs +Directly use all ancillary config files from the older xdm/kdm configuration. This is usually a bad idea. +.TP +.B \-\-no\-backup +Overwrite/delete old config files instead of backing them up. +.TP +.B \-\-no\-in\-notice +Don't put the notice about \fB\-\-in\fP being used into the generated README. +.SH SEE ALSO +.BR kdm (1) +.SH AUTHORS +.nf +Oswald Buddenhagen <ossi@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kblankscrn.kss.1 +++ kdebase-3.5.6/debian/man/kblankscrn.kss.1 @@ -0,0 +1,156 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KBLANKSCRN.KSS 1 "June 2006" "K Desktop Environment" "KDE screen saver" +.SH NAME +kblankscrn.kss +\- KDE screensaver which shows a blank screen +.SH SYNOPSIS +\fBkblankscrn.kss\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBKBlankScreen\fP is a screensaver which shows a blank screen. +.SH OPTIONS +.SS Options: +.TP +.B \-\-setup +Setup screen saver +.TP +.B \-\-window\-id wid +Run in the specified XWindow +.TP +.B \-\-root +Run in the root XWindow +.TP +.B \-\-demo +Start screen saver in demo mode [default] +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH AUTHORS +.nf +The KDE Project <www.kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kpersonalizer.1 +++ kdebase-3.5.6/debian/man/kpersonalizer.1 @@ -0,0 +1,66 @@ +.TH KPERSONALIZER 1 +.SH NAME +kpersonalizer - KDE basic settings wizard + +.SH SYNOPSIS + +.B kpersonalizer [OPTION...] + +.SH DESCRIPTION + +The KDE Personalizer (KPersonalizer) is a wizard to configure KDE, and should automatically be run the first time a user runs KDE, to allow the user to configure basic KDE settings. +.PP +KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the KDE Control Center application. + +.SH OPTIONS + +KPersonalizer accepts the following options: +.PP +.B Help options +.TP +.B \-\-help +Show help about options. +.TP +.B \-\-help-qt +Show Qt specific options. +.TP +.B \-\-help-kde +Show KDE specific options. +.TP +.B \-\-help-all +Show all options. +.TP +.B \-\-author +Show author information. +.TP +.B \-v, \-\-version +Show version information. +.TP +.B \-\-license +Show license information. + +.PP +.B Options +.TP +.B \-r +KPersonalizer is restarted by itself. +.TP +.B \-\-before-session +KPersonalizer is started before the KDE session. + +.SH EXAMPLES +.TP +.B kpersonalizer +Run kpersonalizer to set (or reset) KDE preferences. +.TP +.B kpersonalizer --before-session +Run kpersonalizer before the first KDE session. + +.SH AUTHORS + +Kpersonalizer was written by Ralf Nolden <nolden@kde.org>, Carsten Wolff <wolff@kde.org>, qwertz <kraftw@gmx.de>, and Bernhard Rosenkraenzer <bero@redhat.com>. +.PP +This manual page was written by Joe Brockmeier <jzb@zonker.net>, for the Debian GNU/Linux project, but may be used by others. +.SH "SEE ALSO" +.TP +.BR khelpcenter (1) --- kdebase-3.5.6.orig/debian/man/khotkeys.1 +++ kdebase-3.5.6/debian/man/khotkeys.1 @@ -0,0 +1,150 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KHOTKEYS 1 "June 2006" "K Desktop Environment" "KHotKeys daemon" +.SH NAME +khotkeys +\- daemon to bind actions to triggers and conditions +.SH SYNOPSIS +\fBkhotkeys\fP [Qt\-options] [KDE\-options] +.SH DESCRIPTION +\fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.TP +.B \-\-nofork +Don't run in the background. +.SS + +.SH FILES +.I ~/.kde/share/config/khotkeysrc +\fBkhotkeys\fP configuration file + +.SH AUTHORS +.nf +Lubos Lunak <l.lunak@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/konqueror.1 +++ kdebase-3.5.6/debian/man/konqueror.1 @@ -0,0 +1,245 @@ +.\" This file was generated by kdemangen.pl +.TH KONQUEROR 1 "Jan 2005" "K Desktop Environment" "Web browser, file manager, ..." +.SH NAME +konqueror +- Web browser, file manager, ... +.SH SYNOPSIS +konqueror [Qt-options] [KDE-options] [options] [URL] +.SH DESCRIPTION +Konqueror is the file manager for the K Desktop Environment. +It supports basic file management on local UNIX filesystems, +from simple cut/copy and paste operations to advanced remote +and local network file browsing. + +It is also the canvas for all the latest KDE technology, +from KIO slaves (which provide mechanisms for file access) to +component embedding via the KParts object interface, and it +is one of the most customizable applications available. + +Konqueror is an Open Source web browser with HTML4.0 compliance, +supporting Java applets, JavaScript, CSS1 and (partially) CSS2, +as well as Netscape plugins (for example, Flash or RealVideo plugins). + +It is a universal viewing application, capable of embedding +read-only viewing components in itself to view +documents without ever launching another application. + +This package is part of the official KDE base module. + + +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B URL +Location to open +.SS Options: +.TP +.B --silent +Start without a default window +.TP +.B --preload +Preload for later use +.TP +.B --profile <profile> +Profile to open +.TP +.B --profiles +List available profiles +.TP +.B --mimetype <mimetype> +Mimetype to use for this URL (e.g. text/html or inode/directory) +.TP +.B --select +For URLs that point to files, opens the directory and selects the file, instead of opening the actual file +.SS +.SS Generic options: +.TP +.B --help +Show help about options +.TP +.B --help-qt +Show Qt specific options +.TP +.B --help-kde +Show KDE specific options +.TP +.B --help-all +Show all options +.TP +.B --author +Show author information +.TP +.B -v, --version +Show version information +.TP +.B --license +Show license information +.TP +.B -- +End of options +.SS +.SS KDE options: +.TP +.B --caption <caption> +Use 'caption' as name in the titlebar +.TP +.B --icon <icon> +Use 'icon' as the application icon +.TP +.B --miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B --config <filename> +Use alternative configuration file +.TP +.B --dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B --nocrashhandler +Disable crash handler, to get core dumps +.TP +.B --waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B --style <style> +sets the application GUI style +.TP +.B --geometry <geometry> +sets the client geometry of the main widget +.SS +.SS Qt options: +.TP +.B --display <displayname> +Use the X-server display 'displayname' +.TP +.B --session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B --cmap +Causes the application to install a private color +map on an 8-bit display +.TP +.B --ncols <count> +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B --nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B --dograb +running under a debugger can cause an implicit +-nograb, use -dograb to override +.TP +.B --sync +switches to synchronous mode for debugging +.TP +.B --fn, --font <fontname> +defines the application font +.TP +.B --bg, --background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B --fg, --foreground <color> +sets the default foreground color +.TP +.B --btn, --button <color> +sets the default button color +.TP +.B --name <name> +sets the application name +.TP +.B --title <title> +sets the application title (caption) +.TP +.B --visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display +.TP +.B --inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B --im <XIM server> +set XIM server +.TP +.B --noxim +disable XIM +.TP +.B --reverse +mirrors the whole layout of widgets +.SS + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/konqueror/ +directly into konqueror or you can run +.BR "`khelpcenter help:/konqueror/'" +from the command-line. +.br +.SH AUTHORS +.nf +David Faure <faure@kde.org> +.br +Simon Hausmann <hausmann@kde.org> +.br +Michael Reiher <michael.reiher@gmx.de> +.br +Matthias Welk <welk@fokus.gmd.de> +.br +Alexander Neundorf <neundorf@kde.org> +.br +Michael Brade <brade@kde.org> +.br +Lars Knoll <knoll@kde.org> +.br +Dirk Mueller <mueller@kde.org> +.br +Peter Kelly <pmk@post.com> +.br +Waldo Bastian <bastian@kde.org> +.br +Germain Garand <germain@ebooksfrance.org> +.br +Leo Savernik <l.savernik@aon.at> +.br +Stephan Kulow <coolo@kde.org> +.br +Antti Koivisto <koivisto@kde.org> +.br +Apple Safari Developers +.br +Harri Porten <porten@kde.org> +.br +Koos Vriezen <koos.vriezen@xs4all.nl> +.br +Matt Koss <koss@miesto.sk> +.br +Alex Zepeda <zipzippy@sonic.net> +.br +Richard Moore <rich@kde.org> +.br +Dima Rogozin <dima@mercury.co.il> +.br +Wynn Wilkes <wynnw@calderasystems.com> +.br +Stefan Schimanski <schimmi@kde.org> +.br +George Staikos <staikos@kde.org> +.br +Dawit Alemayehu <adawit@kde.org> +.br +Carsten Pfeiffer <pfeiffer@kde.org> +.br +Torsten Rahn <torsten@kde.org> +.br +Torben Weis <weis@kde.org> +.br +Joseph Wenninger <jowenn@kde.org> +.br + --- kdebase-3.5.6.orig/debian/man/kdialog.1 +++ kdebase-3.5.6/debian/man/kdialog.1 @@ -0,0 +1,209 @@ +.TH KDIALOG "1" "December 2002" "KDE" "KDE Application" +.SH NAME +kdialog \- Show KDE dialog boxes from shell scripts +.SH SYNOPSIS +.B kdialog +[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] [\fIarg\fR] +.SH DESCRIPTION +This manual page documents briefly the +.B kdialog +KDE Application. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B kdialog +allows to display dialog boxes from shell scripts. +The syntax is very much inspired from the +.B dialog +command +(which shows text mode dialogs). +.SH OPTIONS +.TP +.BI \-\-yesno " text" +Question message box with yes/no buttons +.TP +.BI \-\-yesnocancel " text" +Question message box with yes/no/cancel buttons +.TP +.BI \-\-warningyesno " text" +Warning message box with yes/no buttons +.TP +.BI \-\-warningcontinuecancel " text" +Warning message box with continue/cancel buttons +.TP +.BI \-\-warningyesnocancel " text" +Warning message box with yes/no/cancel buttons +.TP +.BI \-\-sorry " text" +\&'Sorry' message box +.TP +.BI \-\-error " text" +\&'Error' message box +.TP +.BI \-\-msgbox " text" +Message Box dialog +.TP +.BI \-\-inputbox " text init" +Input Box dialog +.TP +.BI \-\-password " text" +Password dialog +.TP +.RI \fB\-\-textbox\fP \ file " [" width "] [" height ] +Text Box dialog +.TP +.RI \fB\-\-menu\fP \ text " [" "tag item" "] [" "tag item" "] ..." +Menu dialog +.TP +.RI \fB\-\-checklist\fP \ text " [" "tag item status" "] ..." +Check List dialog +.TP +.RI \fB\-\-radiolist\fP " text" " [" "tag item status" "] ..." +Radio List dialog +.TP +.BI \-\-title " text" +Dialog title +.TP +.B \-\-separate\-output +Return list items on separate lines (for checklist option) +.SS "Arguments:" +.TP +arg +Arguments - depending on main option +.SS "Generic options:" +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +\fB\-v\fR, \fB\-\-version\fR +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS "Qt options:" +.TP +.BI \-\-display \ displayname +Use the X-server display \fIdisplayname\fP. +.TP +.BI \-\-session \ sessionId +Restore the application for the given \fIsessionId\fP. +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display. +.TP +.BI \-\-ncols \ count +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification. +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard. +.TP +.B \-\-dograb +running under a debugger can cause an implicit +.B \-nograb, use \fB\-dograb\fR to override. +.TP +.B \-\-sync +switches to synchronous mode for debugging. +.TP +.BI "\-\-fn\fR, \fP\-\-font" \ fontname +defines the application font. +.TP +.BI "-\-bg\fR, \fB\-\-background" \ color +sets the default background color and an +application palette (light and dark shades are +calculated). +.TP +.BI "\-\-fg\fR, \fB\-\-foreground" \ color +sets the default foreground color. +.TP +.BI \-\-btn\fR, \fB\-\-button \ color +sets the default button color. +.TP +.BI \-\-name \ name +sets the application name. +.TP +.BI \-\-title \ title +sets the application title (caption). +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display. +.TP +.BI \-\-inputstyle \ inputstyle +sets XIM (X Input Method) input style. Possible +values are +.BR onthespot ", " overthespot ", " offthespot and root . +.TP +.BI \-\-im " XIM-server" +set XIM server. +.TP +.B \-\-noxim +disable XIM. +.TP +.B \-\-reverse +mirrors the whole layout of widgets. +.SS "KDE options:" +.TP +.BI \-\-caption \ caption +Use \fIcaption\fP as name in the titlebar. +.TP +.BI \-\-icon \ icon +Use \fIicon\fP as the application icon. +.TP +.BI \-\-miniicon \ icon +Use \fIicon\fP as the icon in the titlebar. +.TP +.BI \-\-config \ filename +Use alternative configuration file. +.TP +.BI \-\-dcopserver \ server +Use the DCOP Server specified by \fIserver\fP. +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps. +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager. +.TP +.BI \-\-style \ style +sets the application GUI style. +.TP +.BI \-\-geometry \ geometry +sets the client geometry of the main widget. +.SH AUTHOR +KDialog was written by +.nh +.ad l +David Faure <faure@kde.org>, +Nick Thompson, +Nick Thompson, +Matthias Hoelzer <hoelzer@kde.org> and +David Gumbel <david.guembel@gmx.net>. +.br +.hy +Please use http://bugs.kde.org to report bugs, do not mail the authors directly. +.br +This manual page was prepared by +.nh +.ad l +Karolina Lindqvist <pgd\-karolinali@algonet.se> +.hy +for the Debian GNU/Linux system (but may be used by others). --- kdebase-3.5.6.orig/debian/man/kdcop.1 +++ kdebase-3.5.6/debian/man/kdcop.1 @@ -0,0 +1,159 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDCOP 1 "June 2006" "K Desktop Environment" "A graphical DCOP browser/client" +.SH NAME +kdcop +\- A graphical DCOP browser/client +.SH SYNOPSIS +\fBkdcop\fP [Qt\-options] [KDE\-options] +.SH DESCRIPTION +\fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system, +their interfaces, and the interfaces' arguments. You can even execute DCOP +calls by double\-clicking on a call. If the method has parameters, \fBkdcop\fP will +open a dialog and prompt you for them. If the method returns a return value, +you will see it in a message box after the call. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kdcop/ +directly into konqueror or you can run +.BR "khelpcenter help:/kdcop/" +from the command\-line. +.br +.SH AUTHORS +.nf +Matthias Kalle Dalheimer <kalle@kde.org> +.br +Rik Hemsley <rik@kde.org> +.br +Ian Reinhart Geiser <geiseri@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kpager.1 +++ kdebase-3.5.6/debian/man/kpager.1 @@ -0,0 +1,53 @@ +.TH KPAGER 1 "August, 24 2003" +.SH NAME +kpager \- KDE desktop pager +.SH SYNOPSIS +.B kpager +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B kpager +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkpager\fP is a desktop pager for the KDE desktop. It creates mini-views of the different KDE desktops. These views show the real content of the desktop, or only icons. +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-\-help +Show summary of options. +.TP +.B \-\-help\-qt +Show QT specific help (common for all QT apps). +.TP +.B \-\-help\-kde +Show KDE specific help (common for all KDE apps). +.TP +.B \-\-help\-all +Show the complete help. +.TP +.B \-\-author +Show program author(s). +.TP +.B \-\-license +Show program license. +.TP +.B \-v, \-\-version +Show version of program. +.TP +.B \-\-hidden +Create the preview of the desktops, but hide the window +.SH SEE ALSO +For more details, you should have a look at the KDE Help center, available +from the K menu. +.SH AUTHOR +This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, +for the Debian GNU/Linux project (but may be used by others). +.PP +kpager was written by the KDE project --- kdebase-3.5.6.orig/debian/man/drkonqi.1 +++ kdebase-3.5.6/debian/man/drkonqi.1 @@ -0,0 +1,175 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH DRKONQI 1 "June 2006" "K Desktop Environment" "KDE crash handler" +.SH NAME +drkonqi +\- KDE crash handler gives the user feedback if a program crashed +.SH SYNOPSIS +\fBdrkonqi\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +The KDE crash handler gives the user feedback if a program crashed. +.SH OPTIONS +.SS Options: +.TP +.B \-\-signal <number> +The signal number that was caught +.TP +.B \-\-appname <name> +Name of the program +.TP +.B \-\-apppath <path> +Path to the executable +.TP +.B \-\-appversion <version> +The version of the program +.TP +.B \-\-bugaddress <address> +The bug address to use +.TP +.B \-\-programname <name> +Translated name of the program +.TP +.B \-\-pid <pid> +The PID of the program +.TP +.B \-\-startupid <id> +Startup ID of the program +.TP +.B \-\-kdeinit +The program was started by kdeinit +.TP +.B \-\-safer +Disable arbitrary disk access +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH AUTHORS +.nf +Hans Petter Bieker <bieker@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kate.1 +++ kdebase-3.5.6/debian/man/kate.1 @@ -0,0 +1,83 @@ +.TH KATE 1 "May 2006" +.SH NAME +kate \- KDE Advanced Text Editor +.SH SYNOPSIS +.B kate +.RI [ options ] [file(s)] +.SH DESCRIPTION +This manual page documents briefly the +.B kate +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkate\fP is a powerful text editor for KDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ... + +It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator. + +Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example. + +It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...) + +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-\-help +Show summary of options. +.TP +.B \-\-help\-qt +Show QT specific help (common for all QT apps). +.TP +.B \-\-help\-kde +Show KDE specific help (common for all KDE apps). +.TP +.B \-\-help\-all +Show the complete help. +.TP +.B \-\-author +Show program author(s). +.TP +.B \-\-license +Show program license. +.TP +.B \-v, \-\-version +Show version of program. +.TP +.B \-s, \-\-start <name> +Start Kate with a given session +.TP +.B \-u, \-\-use +Use a already running kate instance (if possible) +.TP +.B \-p, \-\-pid <pid> +Only try to reuse kate instance with this pid +.TP +.B \-e, \-\-encoding <name> +Set encoding for the file to open +.TP +.B \-l, \-\-line <line> +Navigate to this line +.TP +.B \-c, \-\-column <column> +Navigate to this column +.TP +.B \-i, \-\-stdin +Read the contents of stdin +.TP +.B file(s) +is the file or the files to open + +.SH SEE ALSO +.BR kwrite (1) +.PP +For more details, you should have a look at the KDE Help center, available +from the K menu. +.SH AUTHOR +This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others. +.PP +kate was written by the KDE project --- kdebase-3.5.6.orig/debian/man/kicker.1 +++ kdebase-3.5.6/debian/man/kicker.1 @@ -0,0 +1,171 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KICKER 1 "June 2006" "K Desktop Environment" "The KDE panel" +.SH NAME +kicker +\- The KDE panel +.SH SYNOPSIS +\fBkicker\fP [Qt\-options] [KDE\-options] +.SH DESCRIPTION +\fBKicker\fP is the KDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop. +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.TP +.B \-\-nofork +Don't run in the background. + +.SH SEE ALSO +\fBkasbar\fP(1) +.sp 1 +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/kicker/ +directly into konqueror or you can run +.BR "khelpcenter help:/kicker/" +from the command\-line. +.br +.SH AUTHORS +.nf +Aaron J. Seigo <aseigo@kde.org> +.br +Matthias Elter <elter@kde.org> +.br +Matthias Ettrich <ettrich@kde.org> +.br +Wilco Greven <greven@kde.org> +.br +Rik Hemsley <rik@kde.org> +.br +Daniel M. Duley <mosfet@kde.org> +.br +Preston Brown <pbrown@kde.org> +.br +John Firebaugh <jfirebaugh@kde.org> +.br +Waldo Bastian <bastian@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/krootimage.1 +++ kdebase-3.5.6/debian/man/krootimage.1 @@ -0,0 +1,151 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KROOTIMAGE 1 "June 2006" "K Desktop Environment" "helper program" +.SH NAME +krootimage +\- set desktop background for kdm +.SH SYNOPSIS +\fBkrootimage\fP [Qt\-options] [KDE\-options] config +.SH DESCRIPTION +\fBkrootimage\fP is a helper program for \fBkdm\fP to set the desktop background. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B config +Name of the configuration file +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH SEE ALSO +.BR kdm (1) +.SH AUTHORS +.nf +Matthias Hoelzer\-Kluepfel <hoelzer@kde.org> +.br +Oswald Buddenhagen <ossi@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kdepasswd.1 +++ kdebase-3.5.6/debian/man/kdepasswd.1 @@ -0,0 +1,169 @@ +.TH KDEPASSWD 1 + +.SH NAME +kdepasswd \- graphical frontend to change the user's password + +.SH SYNOPSIS +.B kdepasswd [ \fIQt-options\fR ] [ \fIKDE-options\fR ] \fIoptions\fR + +.SH DESCRIPTION +Changes a UNIX password. + +.SH OPTIONS +.B Generic options: +.TP +.HP +.B \-\-help +Show help about options +.TP +.HP +.B \-\-help\-qt +Show Qt specific options +.TP +.HP +.B \-\-help\-kde +Show KDE specific options +.TP +.HP +.B \-\-help\-all +Show all options +.TP +.HP +.B \-\-author +Show author information +.TP +.HP +.B \-v\fR, \fB \-\-version +Show version information +.TP +.HP +.B \-\-license +Show license information +.TP +.B Qt options: +.TP +.HP +.B \-\-display <displayname> +Use the X-server display 'displayname'. +.TP +.HP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId'. +.TP +.HP +.B \-\-cmap +Causes the application to install a private +color map on an 8-bit display. +.TP +.HP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification. +.TP +.HP +.B \-\-nograb +Tells Qt to never grab the mouse or the keyboard. +.TP +.HP +.B \-\-dograb +Running under a debugger can cause an implicit +-nograb, use -dograb to override. +.TP +.HP +.B \-\-sync +Switches to synchronous mode for debugging. +.TP +.HP +.B \-\-fn, \-\-font <fontname> +Defines the application font. +.TP +.HP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated). +.TP +.HP +.B \-\-fg, \-\-foreground <color> +Sets the default foreground color. +.TP +.HP +.B \-\-btn, \-\-button <color> +Sets the default button color. +.TP +.HP +.B \-\-name <name> +Sets the application name. +.TP +.HP +.B \-\-title <title> +Sets the application title (caption). +.TP +.HP +.B \-\-visual TrueColor +Forces the application to use a TrueColor visual on +an 8-bit display. +.TP +.HP +.B \-\-inputstyle <inputstyle> +Sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root. +.TP +.HP +.B \-\-im <XIM server> +Set XIM server. +.TP +.HP +.B \-\-noxim +Disable XIM. +.TP +.HP +.B \-\-reverse +Mirrors the whole layout of widgets. +.TP +.B KDE options: +.TP +.HP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar. +.TP +.HP +.B \-\-icon <icon> +Use 'icon' as the application icon. +.TP +.HP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar. +.TP +.HP +.B \-\-config <filename> +Use alternative configuration file. +.TP +.HP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server'. +.TP +.HP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps. +.TP +.HP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager. +.TP +.HP +.B \-\-style <style> +Sets the application GUI style. +.TP +.HP +.B \-\-geometry <geometry> +Sets the client geometry of the main widget. + +.SH "SEE ALSO" +.BR passwd (1). + +.SH AUTHOR +Andre Ramos <andre@alunos.di.fc.ul.pt> --- kdebase-3.5.6.orig/debian/man/kmenuedit.1 +++ kdebase-3.5.6/debian/man/kmenuedit.1 @@ -0,0 +1,51 @@ +.TH KMENUEDIT 1 "August, 24 2003" +.SH NAME +kmenuedit \- editor for the KDE menu +.SH SYNOPSIS +.B kmenuedit +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B kmenuedit +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkmenuedit\fP is a powerful editor for the KDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ... +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-\-help +Show summary of options. +.TP +.B \-\-help\-qt +Show QT specific help (common for all QT apps). +.TP +.B \-\-help\-kde +Show KDE specific help (common for all KDE apps). +.TP +.B \-\-help\-all +Show the complete help. +.TP +.B \-\-author +Show program author(s). +.TP +.B \-\-license +Show program license. +.TP +.B \-v, \-\-version +Show version of program. + +.SH SEE ALSO +For more details, you should have a look at the KDE Help center, available +from the K menu. +.SH AUTHOR +This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, +for the Debian GNU/Linux project (but may be used by others). +.PP +kmenuedit was written by the KDE project --- kdebase-3.5.6.orig/debian/man/kdm_greet.1 +++ kdebase-3.5.6/debian/man/kdm_greet.1 @@ -0,0 +1,22 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" +.SH NAME +kdm_greet +\- KDE greeter module for kdm +.SH SYNOPSIS +\fBkdm_greet\fP +.SH DESCRIPTION +\fBkdm_greet\fP is a KDE greeter module for \fBkdm\fP. It shows the login dialog. +.SH SEE ALSO +.BR kdm (1) +.SH AUTHORS +.nf +Oswald Buddenhagen <ossi@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kio_media_mounthelper.1 +++ kdebase-3.5.6/debian/man/kio_media_mounthelper.1 @@ -0,0 +1,163 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "K Desktop Environment" "helper program" +.SH NAME +kio_media_mounthelper +\- kio_media_mounthelper +.SH SYNOPSIS +\fBkio_media_mounthelper\fP [Qt\-options] [KDE\-options] [options] URL +.SH DESCRIPTION +\fBkio_media_mounthelper\fP is a helper program to handle the mounting of media in KDE. It is part of the KIO subsystem. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B URL +media:/ URL to mount/unmount/eject/remove +.SS Options: +.TP +.B \-u +Unmount given URL +.TP +.B \-m +Mount given URL (default) +.TP +.B \-e +Eject given URL via kdeeject +.TP +.B \-s +Unmount and Eject given URL (necessary for some USB devices) +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH AUTHORS +.nf +Waldo Bastian <bastian@kde.org> +.br +Kevin Ottens <ervin@ipsquad.net> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kcminit.1 +++ kdebase-3.5.6/debian/man/kcminit.1 @@ -0,0 +1,153 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KCMINIT 1 "June 2006" "K Desktop Environment" "KDE Control Modules initialization" +.SH NAME +kcminit +\- runs startups initialization for Control Modules. +.SH SYNOPSIS +\fBkcminit\fP [Qt\-options] [KDE\-options] [options] module +.SH DESCRIPTION +\fBkcminit\fP runs startups initialization for Control Modules. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B module +Configuration module to run +.SS Options: +.TP +.B \-\-list +List modules that are run at startup +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH AUTHORS +.nf +Matthias Hoelzer\-Kluepfel <hoelzer@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kdmctl.1 +++ kdebase-3.5.6/debian/man/kdmctl.1 @@ -0,0 +1,220 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDMCTL 1 "June 2006" "K Desktop Environment" "KDM remote control application" +.SH NAME +kdmctl +\- kdm remote control application +.SH SYNOPSIS +\fBkdmctl\fP [options] [command [command arguments]] +.SH DESCRIPTION +\fBkdmctl\fP is an application to remote\-control \fBkdm\fP. It makes use of UNIX domain sockets. +.sp 1 +There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user). +.sp 1 +The directory in which the sockets are located is determined this way: +.RS 3 +\- the \fB\-s\fP option is examined +.br +\- the $DM_CONTROL variable is examined +.br +\- the kdm config file is searched for the FifoDir key +.br +.RI \- /var/run/xdmctl \ and\ /var/run \ are\ tried +.RE +.sp 1 +If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the +display\-specific control socket will be used, otherwise the global one. +.sp 1 +Tokens in the command and the reply are tab\-separated. +Command arguments can be specified as separate command line parameters, +in which case they are simply concatenated with tabs in between. +.sp 1 +If the command is '\-', \fBkdmctl\fP reads commands from stdin. +The default command is 'caps'. +.SH OPTIONS +.SS +.SS Options: +.TP +.B \-h \-help +print help message. +.TP +.B \-g \-global +Use global control socket even if $DISPLAY is set +.TP +.B \-d \-display +Override $DISPLAY +.TP +.B \-s \-sockets +Override $DM_CONTROL +.TP +.B \-c \-config +Use alternative kdm config file +.SS Commands: +.br +.SS Global commands: +.TP +.B login +display (now|schedule) user password [session_arguments] +.br + login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits. +.br +session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values. +.SS Per\-display commands: +.TP +.B lock +The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on. +.TP +.B unlock +Reverse the effect of "lock": re\-enable auto\-relogin. +.TP +.B suicide +The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed. +.SS Commands for all sockets: +.TP +.B caps +Returns a list of this socket's capabilities: +.IP " \- kdm" +identifies kdm, in case some other DM implements this protocol, too. +.IP " \- list, activate, lock, suicide, login" +the respective command is supported. +.IP " \- bootoptions" +the "listbootoptions" command and the "=" option to "shutdown" are supported. +.IP " \- shutdown <list>" +"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users. +.IP " \- shutdown" +"shutdown" is supported and allowed to everybody. +.IP " \- nuke <list>" +forced shutdown is allowed to the listed users. +.IP " \- nuke" +forced shutdown is allowed to everybody. +.IP " \- reserve <number>" +reserve displays are configured and <number> are available at this time. +.TP +\fBlist\fP [all|alllocal] +.br +Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped. +.sp 1 +Each session entry is a comma\-separated tuple of: +.RS 7 +\- Display or TTY name +.br +\- VT name for local sessions +.br +\- Logged in user's name, empty for passive sessions and outgoing +.br + remote sessions (local chooser mode) +.br +\- Session type or remote host for outgoing remote sessions, +.br + empty for passive sessions +.br +\- A flag field: +.RS 5 +\- "t" for tty sessions +.br +\- "*" for the display belonging to the requesting socket +.br +\- "!" for sessions that cannot be killed by the requesting +.br + socket +.br +\- New flags might be added later +.br +.RE +\- New fields might be added later +.RE +.TP +\fBreserve\fP [timeout in seconds] +.br +Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too. +.br +Permitted only on sockets of local displays and the global socket. +.TP +\fBactivate\fP (vt|display) +.br +Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2). +.br +Permitted only on sockets of local displays and the global socket. +.TP +.B listbootoptions +List available boot options. +.br +=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable. +.TP +\fBshutdown\fP (reboot|halt) [=bootchoice] +.br + (ask|trynow|forcenow|schedule|start +.br + (\-1|end (force|forcemy|cancel))) +.br +.RS 7 +Request a system shutdown, either a reboot or a halt/poweroff. +.sp 1 +An OS choice for the next boot may be specified from the list returned by "listbootoptions". +.sp 1 +Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication. +.sp 1 +start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately. +.sp 1 +end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBKDM\fP can do one of the following: +.RS 3 +- "cancel" \- give up the shutdown. +.br +- "force" \- shut down nonetheless. +.br +- "forcemy" \- shut down nonetheless if all active sessions +.br + belong to the requesting user. Only for per\-display sockets. +.RE +.sp 1 +start and end are specified in seconds since the UNIX epoch. +.sp 1 +"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1". +.sp 1 +"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets. +.RE +.TP +\fBshutdown cancel\fP [local|global] +.br +Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request. +.TP +\fBshutdown status\fP +Return a list with information about shutdowns. +.br +The entries are comma\-separated tuples of: +.RS 10 +\- ("global"|"local") \- pending vs. queued shutdown. A local +.br + entry can be returned only by a per\-display socket. +.br +\- ("halt"|"reboot") +.br +\- start +.br +\- end +.br +\- ("ask"|"force"|"forcemy"|"cancel") +.br +\- Numeric user ID of the requesting user, \-1 for the global +.br + socket. +.br +\- The next boot OS choice or "\-" for none. +.br +\- New fields might be added later. +.RE +.SH SEE ALSO +.BR kdm (1) +.TP +.I /usr/share/doc/kdm/README.gz +Information about the command sockets (and \fBkdm\fP) +.SH AUTHORS +.nf +Oswald Buddenhagen <ossi@kde.org> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/ksystraycmd.1 +++ kdebase-3.5.6/debian/man/ksystraycmd.1 @@ -0,0 +1,189 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KSYSTRAYCMD 1 "June 2006" "K Desktop Environment" "system tray utility" +.SH NAME +ksystraycmd +\- Allows any application to be kept in the system tray +.SH SYNOPSIS +\fBksystraycmd\fP [Qt\-options] [KDE\-options] [options] command +.SH DESCRIPTION +The system tray is an area in which an application can display a small window. +It may be used to display status information or provide quick access to commands. +Normally tray icons are developed as part of an application. +\fBksystraycmd\fP allows any application to be kept in the system tray. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B command +Command to execute +.SS +.SS Options: +.TP +.B \-\-window <regexp> +A regular expression matching the window title +If you do not specify one, then the very first window +to appear will be taken \- not recommended. +.TP +.B \-\-wid <int> +The window id of the target window +Specifies the id of the window to use. If the id starts with 0x +it is assumed to be in hex. +.TP +.B \-\-hidden +Hide the window to the tray on startup +.TP +.B \-\-startonshow +Wait until we are told to show the window before +executing the command +.TP +.B \-\-tooltip <text> +Sets the initial tooltip for the tray icon +.TP +.B \-\-keeprunning +Keep the tray icon even if the client exits. This option +has no effect unless startonshow is specified. +.TP +.B \-\-ownicon +Use ksystraycmd's icon instead of window's icon in systray +(should be used with \-\-icon to specify ksystraycmd icon) +.TP +.B \-\-ontop +Try to keep the window above other windows +.TP +.B \-\-quitonhide +Quit the client when we are told to hide the window. +This has no effect unless startonshow is specified and implies keeprunning. +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X\-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH AUTHORS +.nf +Richard Moore <rich@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kstart.1 +++ kdebase-3.5.6/debian/man/kstart.1 @@ -0,0 +1,215 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KSTART 1 "June 2006" "K Desktop Environment" "application launch utility" +.SH NAME +kstart +\- Utility to launch applications with special window properties +.SH SYNOPSIS +\fBkstart\fP [Qt\-options] [KDE\-options] [options] command +.SH DESCRIPTION +Utility to launch applications with special window properties. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B command +Command to execute +.SS +.SS Options: +.TP +.B \-\-window <regexp> +A regular expression matching the window title +.TP +.B \-\-windowclass <class> +A string matching the window class (WM_CLASS property) +The window class can be found out by running +'xprop | grep WM_CLASS' and clicking on a window +(use either both parts separated by a space or only the right part). +NOTE: If you specify neither window title nor window class, +then the very first window to appear will be taken; +omitting both options is NOT recommended. +.TP +.B \-\-desktop <number> +Desktop on which to make the window appear +.TP +.B \-\-currentdesktop +Make the window appear on the desktop that was active +when starting the application +.TP +.B \-\-alldesktops +Make the window appear on all desktops +.TP +.B \-\-iconify +Iconify the window +.TP +.B \-\-maximize +Maximize the window +.TP +.B \-\-maximize\-vertically +Maximize the window vertically +.TP +.B \-\-maximize\-horizontally +Maximize the window horizontally +.TP +.B \-\-fullscreen +Show window fullscreen +.TP +.B \-\-type <type> +The window type: Normal, Desktop, Dock, Tool, +Menu, Dialog, TopMenu or Override +.TP +.B \-\-activate +Jump to the window even if it is started on a +different virtual desktop +.TP +.B \-\-ontop, \-\-keepabove +Try to keep the window above other windows +.TP +.B \-\-onbottom, \-\-keepbelow +Try to keep the window below other windows +.TP +.B \-\-skiptaskbar +The window does not get an entry in the taskbar +.TP +.B \-\-skippager +The window does not get an entry on the pager +.TP +.B \-\-tosystray +The window is sent to the system tray in Kicker +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH AUTHORS +.nf +Matthias Ettrich <ettrich@kde.org> +.br +David Faure <faure@kde.org> +.br +Richard J. Moore <rich@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs, do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kfmclient.1 +++ kdebase-3.5.6/debian/man/kfmclient.1 @@ -0,0 +1,222 @@ +.\" This file was generated by kdemangen.pl +.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added. +.TH KFMCLIENT 1 "Jan 2005" "K Desktop Environment" "KDE tool for opening URLs from the command line" +.SH NAME +kfmclient +- KDE tool for opening URLs from the command line +.SH SYNOPSIS +kfmclient [Qt-options] [KDE-options] [options] command [URL(s)] +.SH DESCRIPTION +kfmclient is a tool for opening local and remote URLs in Konqueror from +the command line. +.SH COMMANDS +.SS +.SS openURL +.TP +kfmclient openURL \fIurl\fR [ \fImimetype\fR ] +Opens a window showing \fIurl\fR. \fIurl\fR may be a relative path or file name, +such as . or subdir/. If \fIurl\fR is omitted, $HOME is used instead. + +If \fImimetype\fR is specified, it will be used to determine the component +that Konqueror should use. For instance, set it to text/html for a web +page, to make it appear faster. +.SS newTab +.TP +kfmclient newTab \fIurl\fR [ \fImimetype\fR ] +Same as above but opens a new tab with \fIurl\fR in an existing Konqueror +window on the current active desktop if possible. +.SS openProfile +.TP +kfmclient openProfile \fIprofile\fR [ \fIurl\fR ] +Opens a window using the given profile. \fIprofile\fR is a file under +~/.kde/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open. +.SS openProperties +.TP +kfmclient openProperties \fIurl\fR +Opens a properties menu. +.SS exec +.TP +kfmclient exec [ \fIurl\fR [ \fIbinding\fR ] ] +Tries to execute \fIurl\fR. \fIurl\fR may be a usual URL, this URL will +be opened. You may omit \fIbinding\fR. In this case the default binding +is tried. Of course URL may be the URL of a document, or it may be a +*.desktop file. +This way you could for example mount a device by passing 'Mount default' +as binding to 'cdrom.desktop'. +.SS move +.TP +kfmclient move \fIsrc\fR \fIdest\fR +Moves the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs. +.SS copy +.TP +kfmclient copy \fIsrc\fR \fIdest\fR +Copies the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs. +.SS download +.TP +kfmclient download [ \fIsrc\fR ] +Copies the URL \fIsrc\fR to a user specified location. \fIsrc\fR may be +a list of URLs, if not present then a URL will be requested. +.SS sortDesktop +.TP +kfmclient sortDesktop +Rearranges all icons on the desktop. +.SS configure +.TP +kfmclient configure +Re-read Konqueror's configuration. +.SS configureDesktop +.TP +kfmclient configureDesktop +Re-read kdesktop's configuration. +.SH OPTIONS +.SS +.SS Generic options: +.TP +.B --help +Show help about options +.TP +.B --help-qt +Show Qt specific options +.TP +.B --help-kde +Show KDE specific options +.TP +.B --help-all +Show all options +.TP +.B --author +Show author information +.TP +.B -v, --version +Show version information +.TP +.B --license +Show license information +.TP +.B -- +End of options +.SS +.SS KDE options: +.TP +.B --caption <caption> +Use 'caption' as name in the titlebar +.TP +.B --icon <icon> +Use 'icon' as the application icon +.TP +.B --miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B --config <filename> +Use alternative configuration file +.TP +.B --dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B --nocrashhandler +Disable crash handler, to get core dumps +.TP +.B --waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B --style <style> +sets the application GUI style +.TP +.B --geometry <geometry> +sets the client geometry of the main widget +.SS +.SS Qt options: +.TP +.B --display <displayname> +Use the X-server display 'displayname' +.TP +.B --session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B --cmap +Causes the application to install a private color +map on an 8-bit display +.TP +.B --ncols <count> +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B --nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B --dograb +running under a debugger can cause an implicit +-nograb, use -dograb to override +.TP +.B --sync +switches to synchronous mode for debugging +.TP +.B --fn, --font <fontname> +defines the application font +.TP +.B --bg, --background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B --fg, --foreground <color> +sets the default foreground color +.TP +.B --btn, --button <color> +sets the default button color +.TP +.B --name <name> +sets the application name +.TP +.B --title <title> +sets the application title (caption) +.TP +.B --visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display +.TP +.B --inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B --im <XIM server> +set XIM server +.TP +.B --noxim +disable XIM +.TP +.B --reverse +mirrors the whole layout of widgets +.SH EXAMPLES +.TP +kfmclient exec file:/root/Desktop/cdrom.desktop "Mount default" +Mounts the CD-ROM. +.TP +kfmclient exec file:/home/weis/data/test.html +Opens the file with default binding. +.TP +kfmclient exec file:/home/weis/data/test.html Netscape +Opens the file with netscape. +.TP +kfmclient exec ftp://localhost/ +Opens new window with URL. +.TP +kfmclient exec file:/root/Desktop/emacs.desktop +Starts emacs. +.TP +kfmclient exec file:/root/Desktop/cdrom.desktop +Opens the CD-ROM's mount directory. +.TP +kfmclient exec . +Opens the current directory. Very convenient. +.SH OTHER +This manual page was written by Adeodato Simo <asp16@alu.ua.es> for the +Debian system (but may be used by others). + +This manual page can be redistribute and/or modified it under the terms +of the GNU General Public License as published by the Free Software +Foundation; version 2 dated June, 1991. +.nf --- kdebase-3.5.6.orig/debian/man/kcheckpass.1 +++ kdebase-3.5.6/debian/man/kcheckpass.1 @@ -0,0 +1,49 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KCHECKPASS 1 "June 2006" "K Desktop Environment" "authentication software" +.SH NAME +kcheckpass +\- The KCheckPass authentication software +.SH SYNOPSIS +\fBkcheckpass\fP +.SH DESCRIPTION +\fBKCheckPass\fP is KDE's authentication program. It is meant to be +used by any software in need of user authentication, most +notably screensavers. +.sp 1 +It enhances security be the following means: +.br +.IP " \-" +It's only a small program, which is hopefully simple enough to +allow it to be SUID root. Setting it to SUID root is necessary +on Shadow Password systems. +.IP " \-" +No other program in need of user authentication, must be +SUID root. +.IP " \-" +It provides a single implementation to check passwords. So one only must take a closer look at \fBKCheckPass\fP to ensure password security. It's much easier for programs using \fBKCheckPass\fP to preserve security. +.PP +.br +\fBTechnique:\fP +.sp 1 +\fBKCheckPass\fP is a simple password checker. Just invoke and send it the password on stdin. +.sp 1 +If the password was accepted, the program exits with 0; +.br +if it was rejected, it exits with 1. Any other exit code signals an error. + +.SH AUTHORS +.nf +Olaf Kirch <okir@caldera.de> +.br +Christian Esken <esken@kde.org> +.br +Oswald Buddenhagen <ossi@kde.org> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kio_system_documenthelper.1 +++ kdebase-3.5.6/debian/man/kio_system_documenthelper.1 @@ -0,0 +1,22 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH kio_system_documenthelper 1 "June 2006" "K Desktop Environment" "helper script" +.SH NAME +kio_system_documenthelper +\- KDE helper script used by document.desktop +.SH SYNOPSIS +\fBkio_system_documenthelper\fP + +.SH DESCRIPTION +The script is used by document.desktop entry to determine if it must be shown or not. + +.SH AUTHORS +.nf +Kevin Ottens <ervin@ipsquad.net> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kappfinder.1 +++ kdebase-3.5.6/debian/man/kappfinder.1 @@ -0,0 +1,54 @@ +.TH KAPPFINDER 1 "August, 24 2003" +.SH NAME +kappfinder \- searches for program to add to the Kde menu +.SH SYNOPSIS +.B kappfinder +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B kappfinder +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the KDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them. +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-\-help +Show summary of options. +.TP +.B \-\-help\-qt +Show QT specific help (common for all QT apps). +.TP +.B \-\-help\-kde +Show KDE specific help (common for all KDE apps). +.TP +.B \-\-help\-all +Show the complete help. +.TP +.B \-\-author +Show program author(s). +.TP +.B \-\-license +Show program license. +.TP +.B \-v, \-\-version +Show version of program. +.TP +.B \-\-dir directory +Use this option to set where the .desktop files will be installed (default is $(HOME)/.kde/share/applnk + +.SH SEE ALSO +For more details, you should have a look at the KDE Help center, available +from the K menu. +.SH AUTHOR +This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, +for the Debian GNU/Linux project (but may be used by others). +.PP +kappfinder was written by the KDE project --- kdebase-3.5.6.orig/debian/man/krandom.kss.1 +++ kdebase-3.5.6/debian/man/krandom.kss.1 @@ -0,0 +1,152 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KRANDOM.KSS 1 "June 2006" "K Desktop Environment" "KDE screen saver" +.SH NAME +krandom.kss +\- Start a random KDE screen saver +.SH SYNOPSIS +\fBkrandom.kss\fP [Qt\-options] [KDE\-options] [options] +.SH DESCRIPTION +\fBkrandom.kss\fP starts a random KDE screen saver. +.SH OPTIONS +.SS Options: +.TP +.B \-\-setup +Setup screen saver +.TP +.B \-\-window\-id wid +Run in the specified XWindow +.TP +.B \-\-root +Run in the root XWindow +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH AUTHORS +.nf + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kwriteconfig.1 +++ kdebase-3.5.6/debian/man/kwriteconfig.1 @@ -0,0 +1,173 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write KConfig entries" +.SH NAME +kwriteconfig +\- Write KConfig entries (for use in shell scripts) +.SH SYNOPSIS +\fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value +.SH DESCRIPTION +\fBkwriteconfig\fP is a command line tool to write values in KDE configuration files. +Nonexisting files/groups/keys will be created. +.sp 1 +If a file given via option \fB\-\-file\fP does not contain a path the KDE standard configuration directory is used. +.SS Example: +.TP +\fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp +writes the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories in configuration \fBfile\fP \fImyrc\fP + +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B value +The value to write. Mandatory, on a shell use '' for empty +.SS Options: +.TP +.B \-\-file <file> +Use <file> instead of global config +.TP +.B \-\-group <group> +Group to look in [KDE] +.TP +.B \-\-key <key> +Key to look for +.TP +.B \-\-type <type> +Type of variable. Use "bool" for a boolean, otherwise it is treated as a string +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.SS + +.SH AUTHORS +.nf +Luis Pedro Coelho <luis_pedro@netcabo.pt> +.br +Bernhard Rosenkraenzer <bero@redhat.com> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/kdeprintfax.1 +++ kdebase-3.5.6/debian/man/kdeprintfax.1 @@ -0,0 +1,160 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KDEPRINTFAX 1 "June 2006" "K Desktop Environment" "A fax utility" +.SH NAME +kdeprintfax +\- a interface to fax-packages +.SH SYNOPSIS +\fBkdeprintfax\fP [Qt\-options] [KDE\-options] [options] [file] +.SH DESCRIPTION +\fBkdeprintfax\fP is a small fax utility to be used with kdeprint. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B file +File to fax (added to the file list) +.SS Options: +.TP +.B \-\-phone +Phone number to fax to +.TP +.B \-\-immediate +Send fax immediately +.TP +.B \-\-batch +Exit after sending +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS + +.SH AUTHORS +.nf +Michael Goffioul <kdeprint@swing.be> +.br + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. --- kdebase-3.5.6.orig/debian/man/keditbookmarks.1 +++ kdebase-3.5.6/debian/man/keditbookmarks.1 @@ -0,0 +1,181 @@ +.\" This file was generated by kdemangen.pl +.TH KEDITBOOKMARKS 1 "Jan 2005" "K Desktop Environment" "Konqueror Bookmarks Editor" +.SH NAME +keditbookmarks +- Konqueror Bookmark Editor +.SH SYNOPSIS +keditbookmarks [Qt-options] [KDE-options] [options] [file] +.SH DESCRIPTION +Bookmark editor for KDE. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B file +File to edit +.SS Options: +.TP +.B --importmoz <filename> +Import bookmarks from a file in Mozilla format +.TP +.B --importns <filename> +Import bookmarks from a file in Netscape (4.x and earlier) format +.TP +.B --importie <filename> +Import bookmarks from a file in Internet Explorer's Favorites format +.TP +.B --importopera <filename> +Import bookmarks from a file in Opera format +.TP +.B --exportmoz <filename> +Export bookmarks to a file in Mozilla format +.TP +.B --exportns <filename> +Export bookmarks to a file in Netscape (4.x and earlier) format +.TP +.B --exporthtml <filename> +Export bookmarks to a file in a printable HTML format +.TP +.B --exportie <filename> +Export bookmarks to a file in Internet Explorer's Favorites format +.TP +.B --exportopera <filename> +Export bookmarks to a file in Opera format +.TP +.B --address <address> +Open at the given position in the bookmarks file +.TP +.B --customcaption <caption> +Set the user readable caption for example "Konsole" +.TP +.B --nobrowser +Hide all browser related functions +.SS +.SS Generic options: +.TP +.B --help +Show help about options +.TP +.B --help-qt +Show Qt specific options +.TP +.B --help-kde +Show KDE specific options +.TP +.B --help-all +Show all options +.TP +.B --author +Show author information +.TP +.B -v, --version +Show version information +.TP +.B --license +Show license information +.TP +.B -- +End of options +.SS +.SS KDE options: +.TP +.B --caption <caption> +Use 'caption' as name in the titlebar +.TP +.B --icon <icon> +Use 'icon' as the application icon +.TP +.B --miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B --config <filename> +Use alternative configuration file +.TP +.B --dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B --nocrashhandler +Disable crash handler, to get core dumps +.TP +.B --waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B --style <style> +sets the application GUI style +.TP +.B --geometry <geometry> +sets the client geometry of the main widget +.SS +.SS Qt options: +.TP +.B --display <displayname> +Use the X-server display 'displayname' +.TP +.B --session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B --cmap +Causes the application to install a private color +map on an 8-bit display +.TP +.B --ncols <count> +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B --nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B --dograb +running under a debugger can cause an implicit +-nograb, use -dograb to override +.TP +.B --sync +switches to synchronous mode for debugging +.TP +.B --fn, --font <fontname> +defines the application font +.TP +.B --bg, --background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B --fg, --foreground <color> +sets the default foreground color +.TP +.B --btn, --button <color> +sets the default button color +.TP +.B --name <name> +sets the application name +.TP +.B --title <title> +sets the application title (caption) +.TP +.B --visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display +.TP +.B --inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B --im <XIM server> +set XIM server +.TP +.B --noxim +disable XIM +.TP +.B --reverse +mirrors the whole layout of widgets +.SS +.SH AUTHORS +.nf +David Faure <faure@kde.org> +.br +Alexander Kellett <lypanov@kde.org> +.br + --- kdebase-3.5.6.orig/debian/man/kfind.1 +++ kdebase-3.5.6/debian/man/kfind.1 @@ -0,0 +1,58 @@ +.TH KFIND 1 "August, 25 2003" +.SH NAME +kfind \- KDE find tool +.SH SYNOPSIS +.B kfind +.RI [ options ] [searchpath] +.SH DESCRIPTION +This manual page documents briefly the +.B kfind +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkfind\fP is a find tool for KDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...) + +It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file) + +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-\-help +Show summary of options. +.TP +.B \-\-help\-qt +Show QT specific help (common for all QT apps). +.TP +.B \-\-help\-kde +Show KDE specific help (common for all KDE apps). +.TP +.B \-\-help\-all +Show the complete help. +.TP +.B \-\-author +Show program author(s). +.TP +.B \-\-license +Show program license. +.TP +.B \-v, \-\-version +Show version of program. + +.TP +.B searchpath +is the path in which the search must be done + +.SH SEE ALSO +For more details, you should have a look at the KDE Help center, available +from the K menu. +.SH AUTHOR +This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, +for the Debian GNU/Linux project (but may be used by others). +.PP +kfind was written by the KDE project --- kdebase-3.5.6.orig/debian/kdeprint.manpages +++ kdebase-3.5.6/debian/kdeprint.manpages @@ -0,0 +1,3 @@ +debian/man/kdeprintfax.1 +debian/man/kjobviewer.1 +debian/man/kprinter.1 --- kdebase-3.5.6.orig/debian/kpersonalizer.menu +++ kdebase-3.5.6/debian/kpersonalizer.menu @@ -0,0 +1,11 @@ +?package(kpersonalizer):\ + needs="X11"\ + section="Apps/System"\ + hints="KDE"\ + title="KPersonalizer"\ + icon32x32="/usr/share/pixmaps/kpersonalizer.xpm"\ + icon16x16="/usr/share/pixmaps/kpersonalizer-16.xpm"\ + command="/usr/bin/kpersonalizer" + +# Icon 32x32 kpersonalizer/cr32-app-kpersonalizer.png kpersonalizer.xpm +# Icon 16x16 kpersonalizer/cr16-app-kpersonalizer.png kpersonalizer-16.xpm --- kdebase-3.5.6.orig/debian/konqueror.manpages +++ kdebase-3.5.6/debian/konqueror.manpages @@ -0,0 +1,3 @@ +debian/man/konqueror.1 +debian/man/kfmclient.1 +debian/man/keditbookmarks.1 --- kdebase-3.5.6.orig/debian/ksysguardd.install +++ kdebase-3.5.6/debian/ksysguardd.install @@ -0,0 +1,2 @@ +debian/tmp/etc/ksysguarddrc +debian/tmp/usr/bin/ksysguardd --- kdebase-3.5.6.orig/debian/KUBUNTU-DEBIAN-CHANGES +++ kdebase-3.5.6/debian/KUBUNTU-DEBIAN-CHANGES @@ -0,0 +1,30 @@ +debian/edit-as-root.desktop and binary-install/konqueror:: +build-deps: add x11proto-kb-dev, libxkbfile-dev, xmkmf + +kdesktop.install: +debian/tmp/usr/share/apps/kdesktop/DesktopLinks/Home.desktop usr/share/apps/kdesktop/unused/ +debian/tmp/usr/share/apps/kdesktop/DesktopLinks/System.desktop usr/share/apps/kdesktop/unused/ +debian/tmp/usr/share/apps/kdesktop/directory.trash usr/share/apps/kdesktop/unused/ +don't install konqueror/profiles except filemanagement and webbrowsing + +konqueror.install: +remove debian/tmp/share/apps/konqsidebartng/entries/system.desktop + +remove .svgz from kdebase-data.install + +replace 10_kdmrc_defaults.diff with 10_kdmrc_defaults_kubuntu.diff + +install/klipper:: + sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/kde3/klipperrc + +binary-install/kdebase-bin:: + install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass + install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap + install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap + +--with-sudo-kdesu-backend + +a couple of Replaces (search for ubuntu) + +debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu /etc/xdg/menus/kde-applications-merged/ --- kdebase-3.5.6.orig/debian/kdebase.README.Debian +++ kdebase-3.5.6/debian/kdebase.README.Debian @@ -0,0 +1,60 @@ +Kdm +=== + +For notes on kdm, read: /usr/share/doc/kdm/README.Debian + + +KDE and media kioslave support +============================== + +The media kioslave, new in KDE 3.4, supports the automatic mounting of +removable devices, such as CD-ROM and DVD drives, USB pen drives, digital +cameras, and many other types of equipment. + +While some functionality is available without the use of HAL, media works +best with HAL (and therefore udev), in combination with pmount. Media +also extends the functionality of many other kioslaves. Check which +packages are recommended by the kdebase-kio-plugins package, and install +accordingly. + +Note that for regular users to use media in conjunction with HAL, they must +be members of the plugdev group (permanently, not through +/etc/security/group.conf). + + +KControl and Logitech mice +========================== + +In combination with the udev or hotplug packages, KControl supports the +advanced configuration of many models of Logitech mice, though regular users +must be members of the plugdev group for this to work. + +Additionally, the system's kernel must be 2.6.14 or later if you are using +udev, though earlier kernels are also supported if the hotplug package is being +used instead. Kernel hotplugging support is essential, as is usbfs/usbdevfs if +hotplug is being used. + +After installing KControl for the first time, or updating to KControl 3.4.x +or later from an earlier package, you will need to unplug and then replug +your mouse, in order to force udev or hotplug to grant special permissions +to your mouse, so that KControl can perform advanced configuration. +Rebooting or restarting udev/hotplug will of course accomplish the same +thing. + + +Installing konsole's bitmap fonts +================================= + +Formerly, the few bitmap fonts KDE included, designed for use with Konsole, +were shipped as part of the xfonts-konsole package. However, as Konsole no +longer uses these fonts by default, and most users no longer use bitmap +fonts at all, KDE now includes these fonts with Konsole itself, and Debian +has followed this practice, including the fonts in the konsole package, and +eliminating the xfonts-konsole package entirely. + +To make use of these legacy fonts, start Konsole, and under Settings --> Font +select "Install Bitmap...". This will allow you to copy the legacy Konsole +fonts to $HOME/.fonts, where, after restarting KDE, all applications run by +that user, including Konsole, will be able to find them. Also make sure that +fontconfig is configured to allow the use of bitmap fonts. If you're not sure, +run, as root, 'dpkg-reconfigure fontconfig' from Konsole. --- kdebase-3.5.6.orig/debian/ubuntu.xmodmap +++ kdebase-3.5.6/debian/ubuntu.xmodmap @@ -0,0 +1,34 @@ +keycode 229 = XF86Search +keycode 235 = XF86MyComputer +keycode 236 = XF86Mail +keycode 237 = XF86AudioMedia +keycode 118 = XF86Music +keycode 178 = XF86WWW +keycode 161 = XF86Calculator + +keycode 162 = XF86AudioPause +keycode 164 = XF86AudioStop +keycode 144 = XF86AudioPrev +keycode 153 = XF86AudioNext + +keycode 160 = XF86AudioMute +keycode 174 = XF86AudioLowerVolume +keycode 176 = XF86AudioRaiseVolume + +keycode 230 = XF86Favorites +keycode 231 = XF86Refresh +keycode 232 = XF86Stop +keycode 233 = XF86Forward +keycode 234 = XF86Back + +keycode 223 = XF86Standby +keycode 165 = XF86Sleep + +keycode 204 = XF86Eject +keycode 245 = XF86Launch0 +keycode 159 = XF86LaunchA +keycode 241 = XF86LaunchB +keycode 205 = XF86LaunchC +keycode 132 = XF86LightBulb + + --- kdebase-3.5.6.orig/debian/konsole.prerm +++ kdebase-3.5.6/debian/konsole.prerm @@ -0,0 +1,44 @@ +#! /bin/sh +# prerm script for konsole +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + /usr/sbin/update-alternatives --remove x-terminal-emulator /usr/bin/konsole + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- kdebase-3.5.6.orig/debian/kdebase-doc-html.doc-base.kate +++ kdebase-3.5.6/debian/kdebase-doc-html.doc-base.kate @@ -0,0 +1,10 @@ +Document: kdebase-doc-html-kate +Title: Kate Handbook +Author: Anders Lund, Seth Rothberg, Dominik Haumann +Abstract: Kate is a programmer's text editor for KDE. +Section: Apps/Text + +Format: HTML +Index: /usr/share/doc/kde/HTML/en/kate/index.html +Files: /usr/share/doc/kde/HTML/en/kate/*.html + --- kdebase-3.5.6.orig/debian/rules +++ kdebase-3.5.6/debian/rules @@ -0,0 +1,77 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/debian-qt-kde.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_KDE_APIDOX := yes + +DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde \ + --with-kcp-pam=kcheckpass --with-kdm-pam=kdm --with-kss-pam=kscreensaver \ + --with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids --enable-gcc-hidden-visibility --with-sudo-kdesu-backend + +DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud + +DEB_DH_STRIP_ARGS := --dbg-package=kdebase-dbg + +DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop + +PACKAGES_WITH_LIBS := kate kcontrol kdebase-bin kicker konqueror ksplash \ + ksysguard kwin libkonq4 + +DEB_DH_MAKESHLIBS_ARGS_kate := -V'kate (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_kcontrol := -V'kcontrol (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_kdebase-bin := -V'kdebase-bin (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_kicker := -V'kicker (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_konqueror := -V'konqueror (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_ksplash := -V'ksplash (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_ksysguard := -V'ksysguard (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_kwin := -V'kwin (>= 4:3.5.5-1)' +DEB_DH_MAKESHLIBS_ARGS_libkonq4 := -V'libkonq4 (>= 4:3.5.5-1)' + +#shlibs_ver = 4:3.5.0-1 +#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) + + +common-install-prehook-arch:: + grep -v -e joystick -e view1394 debian/kcontrol.install > debian/kcontrol.install.kfreebsd-i386 + grep -v -e joystick -e view1394 debian/kcontrol.install > debian/kcontrol.install.kfreebsd-amd64 + grep -v -e media_propsdlgplugin debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-i386 + grep -v -e media_propsdlgplugin debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-amd64 + +clean:: + rm -f debian/kcontrol.install.kfreebsd* debian/kdebase-kio-plugins.install.kfreebs* + +binary-install/kdebase-bin:: + install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass + install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver + install -p -D -m644 debian/ubuntu.xmodmap debian/kdebase-bin/usr/share/apps/kxkb/ubuntu.xmodmap + install -p -D -m644 debian/80ubuntu-xmodmap debian/kdebase-bin/etc/X11/Xsession.d/80ubuntu-xmodmap + +binary-install/kdebase-data:: + # hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time + # it's in fact a linux specific file... + install -p -D -m644 kcontrol/view1394/oui.db debian/kdebase-data/usr/share/apps/kcmview1394/oui.db + install -p -D -m644 debian/debian-kde_default.png debian/kdebase-data/usr/share/wallpapers/debian-kde_default.png + install -p -D -m644 debian/debian-kde_default.png.desktop debian/kdebase-data/usr/share/wallpapers/debian-kde_default.png.desktop + +binary-install/kdm:: + install -p -D -m644 debian/kdm.pam debian/kdm/etc/pam.d/kdm + install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np + +binary-install/konqueror:: + install -p -D -m644 debian/edit-as-root.desktop debian/konqueror/usr/share/apps/konqueror/servicemenus/edit-as-root.desktop + cp debian/konqueror/usr/share/apps/konqueror/konqueror.rc debian/konqueror/usr/share/apps/konqueror/konqueror-orig.rc + install -p -D -m644 debian/konqueror.rc debian/konqueror/usr/share/apps/konqueror/konqueror.rc + +binary-install/kcontrol:: + install -p -D -m755 kcontrol/input/consoleUserPerms debian/kcontrol/etc/hotplug/usb/logitechmouse + cat kcontrol/input/logitechmouse.usermap | sed -e 's/consoleUserPerms/logitechmouse/' \ + > debian/kcontrol/etc/hotplug/usb/logitechmouse.usermap + mkdir -p debian/kcontrol/etc/udev/rules.d + chmod +x debian/usermap.pl + debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules + +install/klipper:: + sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/kde3/klipperrc --- kdebase-3.5.6.orig/debian/khelpcenter.lintian +++ kdebase-3.5.6/debian/khelpcenter.lintian @@ -0,0 +1,3 @@ +khelpcenter: no-shlibs-control-file usr/lib/libkdeinit_khelpcenter.so +khelpcenter: postinst-must-call-ldconfig usr/lib/libkdeinit_khelpcenter.so +khelpcenter: postrm-should-call-ldconfig usr/lib/libkdeinit_khelpcenter.so --- kdebase-3.5.6.orig/debian/not-installed.list +++ kdebase-3.5.6/debian/not-installed.list @@ -0,0 +1,53 @@ +The following files are not installed in any binary package. +This is deliberate. + +/usr/share/apps/kdm/sessions/*.desktop + - many .desktop files are not included since they either do not have Debian + packages, or their Debian packages include their own .desktop session + files for gdm/kdm, or they're not intended to be stand-alone window + managers. Eventually, these should ALL be dropped, since they aren't + really maintained upstream, and kdm isn't the correct place to ship these + anyway. Here's the current list of those dropped: + + aewm++ + afterstep + amiwm + blackbox + cde + cwwm + enlightenment + fluxbox + fvwm95 + fvwm + gnome + golem + icewm + ion + kde + larswm + metacity + openbox + phluid + qvwm + ratpoison + sapphire + sawfish + w9wm + waimea + wmaker + xfce4 + xfce + +/etc/kde3/kdm/README + - useless comments, not intended for the end user. + +/usr/share/fonts/override/fonts.dir + - cruft, as kdebase no longer installs any system fonts. + +/usr/share/apps/kappfinder/apps/Office/lyx.desktop + - a lyx.desktop that works in KDE is provided by lyx-qt, so this just + confuses users. + +/usr/share/apps/kcmview1394/oui.db + - this file is installed, but manually, in debian/rules, since the + KDE build system can't be relied on to do it itself on !Linux. --- kdebase-3.5.6.orig/debian/kate.lintian +++ kdebase-3.5.6/debian/kate.lintian @@ -0,0 +1,2 @@ +kate: shlib-missing-in-control-file libkdeinit_kwrite.so usr/lib/libkdeinit_kwrite.so +kate: shlib-missing-in-control-file libkdeinit_kate.so usr/lib/libkdeinit_kate.so --- kdebase-3.5.6.orig/debian/kate.mime +++ kdebase-3.5.6/debian/kate.mime @@ -0,0 +1,2 @@ +text/plain; kate %s; nametemplate=%s.txt; test=test "$DISPLAY" != ""; priority=5 +text/plain; kwrite %s; nametemplate=%s.txt; test=test "$DISPLAY" != ""; priority=3 --- kdebase-3.5.6.orig/debian/kcontrol.postrm +++ kdebase-3.5.6/debian/kcontrol.postrm @@ -0,0 +1,14 @@ +#!/bin/sh -e + +case "$1" in + + purge) + LINK="/etc/udev/rules.d/025_logitechmouse.rules" + [ ! -L "$LINK" ] || rm -f "$LINK" + ;; + +esac + +#DEBHELPER# + +exit 0 --- kdebase-3.5.6.orig/debian/debian-kde_default.png.desktop +++ kdebase-3.5.6/debian/debian-kde_default.png.desktop @@ -0,0 +1,6 @@ +[Wallpaper] +Encoding=UTF-8 +File=debian-kde_default.png +Name=Debian Desktop +ImageType=pixmap +Author=Andre Ferreira --- kdebase-3.5.6.orig/debian/changelog +++ kdebase-3.5.6/debian/changelog @@ -0,0 +1,4010 @@ +kdebase (4:3.5.6-0ubuntu18) feisty; urgency=low + + * Add kubuntu_94_konqueror_nsplugins_amd64.diff: + - Enables nsplugins support for AMD64 (Closes Malone #98551) + + -- Anthony Mercatante <tonio@ubuntu.com> Thu, 29 Mar 2007 17:45:20 +0100 + +kdebase (4:3.5.6-0ubuntu17) feisty; urgency=low + + * Update kubuntu_52_gtk_qt_engine_config.diff: + - copy the config file before ~/.kde/env/ scripts are + executed so that gtk-qt-engines works at first login. + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 23 Mar 2007 19:38:23 +0100 + +kdebase (4:3.5.6-0ubuntu16) feisty; urgency=low + + [ Richard Johnson ] + * Update kubuntu_93_konq_doc_remove_go_window_menu.diff + to fix compile error + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Mar 2007 13:48:08 +0000 + +kdebase (4:3.5.6-0ubuntu15) feisty; urgency=low + + [ Richard Johnson ] + * Add kubuntu_93_konq_doc_remove_go_window_menu.diff + fix documentation, closes http://launchpad.net/bugs/48462 + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Mar 2007 17:08:48 +0000 + +kdebase (4:3.5.6-0ubuntu14) feisty; urgency=low + + * Update kubuntu_33_kubuntuify_about.diff for links to + new Kubuntu Docs + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 12 Mar 2007 16:41:45 +0000 + +kdebase (4:3.5.6-0ubuntu13) feisty; urgency=low + + * Update of kubuntu_89_new_logout_ui.diff from + Stefan Skotte <sfs@enhance-it.dk> + Fixes using arrows on logout dialogues + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 5 Mar 2007 10:38:55 +0000 + +kdebase (4:3.5.6-0ubuntu12) feisty; urgency=low + + * Add kubuntu_92_krandrtray_config.diff, krandrtray now uses guidance + display configuration module in the first place. + Closes Malone #46877 + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 23 Feb 2007 15:16:32 +0100 + +kdebase (4:3.5.6-0ubuntu11) feisty; urgency=low + + * Fix kubuntu_52_gtk_qt_engine_config.diff to fit with new + gtk-qt-engines package. Closes Malone #36256 + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 23 Feb 2007 12:54:27 +0100 + +kdebase (4:3.5.6-0ubuntu10) feisty; urgency=low + + * Add kubuntu_91_ksplash_fork_too_early_cond.diff, closes + Malone #46682. Patch from Mark Jenkins + * Removed kubuntu_05_kdm_theme_config.diff, kdm config will now be + set via kubuntu-default-settings postinst script. + Closes Malone #58639 + + -- Anthony Mercatante <tonio@ubuntu.com> Thu, 22 Feb 2007 17:18:34 +0100 + +kdebase (4:3.5.6-0ubuntu9) feisty; urgency=low + + * Improved kubuntu_76_kickermedia.diff and + kubuntu_83_media_desktop.diff by Simon Edwards + * Improved kubuntu_89_new_logout_ui.diff by Stefan Skotte + + -- Anthony Mercatante <tonio@ubuntu.com> Sun, 19 Feb 2007 00:25:47 +0100 + +kdebase (4:3.5.6-0ubuntu8) feisty; urgency=low + + * Rebuilt against new kdelibs. + + -- Anthony Mercatante <tonio@ubuntu.com> Sat, 17 Feb 2007 11:44:23 +0100 + +kdebase (4:3.5.6-0ubuntu7) feisty; urgency=low + + * Add kubuntu_90_execute_feedback.diff, replaces the zooming + rectangle that is drawn if you activate an icon in konqueror + for execution feedback. Patch from Johannes Schriewer + * Improved kubuntu_89_new_logout_ui.diff from Stefan Skotte + <sfs@enhance-it.dk> + - tabbing/cursor movement fixed + - resizing issues depending on font sizes + - dropdown box for selecting lilo/grub entries if enabled in + system-settings/Login Manager (hold down Restart button to + get options) + - hibernate/suspend buttons works again + - logout image changed from undo.png to back.png + + -- Anthony Mercatante <tonio@ubuntu.com> Tue, 13 Feb 2007 06:59:32 +0100 + +kdebase (4:3.5.6-0ubuntu6) feisty; urgency=low + + * Add kubuntu_89_new_logout_ui.diff from Stefan Skotte + <sfs@enhance-it.dk>, based on the ubuntu/gnome one + + -- Anthony Mercatante <tonio@ubuntu.com> Wed, 7 Feb 2007 23:42:47 +0100 + +kdebase (4:3.5.6-0ubuntu5) feisty; urgency=low + + * Add kubuntu_88_logout_fade.diff from Stefan Skotte <sfs@enhance-it.dk> + based on http://www.kde-look.org/content/show.php?content=20652 + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 5 Feb 2007 12:29:23 +0000 + +kdebase (4:3.5.6-0ubuntu4) feisty; urgency=low + + * Fix syntax in kdebase-data.install + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 29 Jan 2007 19:48:54 +0000 + +kdebase (4:3.5.6-0ubuntu3) feisty; urgency=low + + * Use correct directory for kde-essentials.menu + + -- Stefan Skotte <sfs@enhance-itNOSPAM.dk> Mon, 29 Jan 2007 14:28:10 +0100 + +kdebase (4:3.5.6-0ubuntu2) feisty; urgency=low + + * Add kubuntu_87_kicker_restore_description_parents.diff + Restores the parents in kmenu in name (description) mode + Closes Malone #67113 + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 26 Jan 2007 02:22:35 +0100 + +kdebase (4:3.5.6-0ubuntu1) feisty; urgency=low + + * New upstream release + * Remove patched applied upstream: + - 02_hal_kwin_fixes_branch.diff + - 29_halbackend_fstab_improvements.diff + - 30_mediamanager_followsymlinks.diff + - 32_camera_icon_from_mimetype.diff + - kubuntu_85_dpms_fix.diff + - kubuntu_86_slovenia_euro.diff + * Update kubuntu_73_nomediaioslave_mounthelper.diff + * Add kubuntu_86_konsole_pty.diff from Michael Vogt to support + attaching new ptys to konsole, needed for kubuntu-update-tool + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 17 Jan 2007 11:22:28 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu18) feisty; urgency=low + + * Update replaces on kdebase data to fix https://launchpad.net/bugs/78947 + + -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 14 Jan 2007 12:54:34 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu17) feisty; urgency=low + + * Add kubuntu_85_language_selector.diff to complete + kubuntu-feisty-language-selector integration + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 12 Jan 2007 11:00:51 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu16) feisty; urgency=low + + * Make debian/80ubuntu-xmodmap resistant to xmodmap failure that could + make this script fail and stop processing other Xsession scripts. + * Added kubuntu_85_dpms_fix.diff to fix wrong reading of DPMS defaults + on startup - all values are in seconds and need conversion to + minutes before being used (LP: #65791). + * Added kubuntu_86_slovenia_euro.diff to change currency for Slovenia + from Slovenian Tolar (SIT) to Euro. + + -- Luka Renko <lure@ubuntu.com> Sat, 6 Jan 2007 12:58:45 +0100 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu15) feisty; urgency=low + + * Make sure patches are not applied before upload + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 5 Jan 2007 21:00:36 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu14) feisty; urgency=low + + * Fix syntax error in kubuntu_72_kxkb_xmodmap.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 5 Jan 2007 12:38:25 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu13) feisty; urgency=low + + * Update kdm init script to stop usplash with "start" + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 4 Jan 2007 23:05:08 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu12) feisty; urgency=low + + * Alter kubuntu_72_kxkb_xmodmap.diff and debian/80ubuntu-xmodmap to load + ~/.Xmodmap for personalised keyboard mapping. Based on patch from + Thorsten Zachmann <zachmann@schlund.de> + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 23 Dec 2006 11:42:26 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu11) feisty; urgency=low + + * Improve kubuntu_76_ksmserver_suspend.diff to respect power-managerrc + options for disabling suspend/hibernate buttons and lock on resume + * Add mapping for Calculator key to XF86Calculator and change Play/Pause + key mapping to XF86AudioPause + + -- Luka Renko <lure@ubuntu.com> Thu, 7 Dec 2006 00:57:59 +0100 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu10) feisty; urgency=low + + * Install trash.desktop into unused directory, so it + doesn't appear on the desktop. + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 5 Dec 2006 17:19:37 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu9) feisty; urgency=low + + * Add missing file debian/80ubuntu-xmodmap + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 22 Nov 2006 09:26:02 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu8) feisty; urgency=low + + * Add ubuntu.xmodmap and install rule + * Add klipper.rc edit rule + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 21 Nov 2006 11:09:49 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu7) feisty; urgency=low + + * Removed debian/tmp/usr/share/services/kfile_trash.desktop + from kdebase-kio-plugins.install + + -- Anthony Mercatante <tonio@ubuntu.com> Tue, 21 Nov 2006 00:01:43 +0200 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu6) feisty; urgency=low + + * Compile with --with-sudo-kdesu-backend + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Nov 2006 10:18:52 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu5) feisty; urgency=low + + * Add missing debian/konqueror.rc file + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 17 Nov 2006 20:37:45 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu4) feisty; urgency=low + + * Use correct kubuntu_01_kdepot.diff patch + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 16 Nov 2006 23:52:10 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu3) feisty; urgency=low + + * rebuild on latest kdelibs + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 16 Nov 2006 19:39:16 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu2) feisty; urgency=low + + * Add missing kubuntu_01_kdepot.diff patch + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Nov 2006 21:19:33 +0000 + +kdebase (4:3.5.5a.dfsg.1-1ubuntu1) feisty; urgency=low + + * Merge with Debian + * Remove kubuntu_18_default_fonts.diff keep 18_default_fonts.diff + * Remove kubuntu_28_kdebase_rubberband.diff now in Debian as 28_kdebase_rubberband.diff + * Remove 33_mounthelper_find_medium_by_url.diff, it clashes with our media ioslave patches + * Build with --enable-gcc-hidden-visibility + * Remove kubuntu_69_no_kcontrol_joystick.diff, it builds now + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 14 Nov 2006 23:20:10 +0000 + +kdebase (4:3.5.5a.dfsg.1-1) unstable; urgency=medium + + * Add 4 new patches. Thanks to Sune Vuorela for investigating and + to Modestas Vainius for creating them: + * 29_halbackend_fstab_improvements + * fixes HALBackend::inInFstab() to correctly match the fstab device node + that is a symlink. + * Improve error messages for HAL/fstab unmount failures. Include a list + of processes using the device in them (if there are any). + * When handling fstab devices, make HALBackend::mount() and + HALBackend::umount() calls block until the operation actually + completes (the same behaviour as with HAL devices). + * In mounthelper always unmount a device before ejecting it. However, + if unmount fails, still try to eject the device. In case of failure, + display the unmount error message which is more informative. + * 30_mediamanager_followsymlinks + * MediaManager::properties() follows symlinks on local paths. + * 32_camera_icon_from_mimetype + * Do not set icons for cameras explicitly, because they can be + determined from the mimetype. In addition, always reset a medium icon + when properties of the medium change. This fixes a problem when the + camera_mounted icon is not reset once the camera storage has been + unmounted. + * 33_mounthelper_find_medium_by_url + * Mounthelper should search for the medium by the whole url in addition + to just the filename. This unbreaks krusader 1.70.x media:/ + unmount/eject commands. + + * Add psmisc to Depends of kdebase-kio-plugins since it provides 'fuser' + utility, needed for listUsingProcesses() function added in + 29_halbackend_fstab_improvements patch. Thanks to Modestas Vainius. + + * Promote eject from Recommends to Depends for kdesktop, and make sure + kdebase-kio-plugins Depends on kdesktop, so that kdeeject is always + present. + + * Update 20_applications_menu_move patch to fix an incomptability with + freedesktop.org menu specification: Note that a system that uses either + gnome-applications.menu or kde-applications.menu depending on the desktop + environment in use must still use applications-merged as the default merge + directory in both cases. Thanks to Kevin Krammer. (Closes: #392807) + + * Version our build-conflict with nvidia-glx, since newer packages should + work. (Closes: #393855) + + * Drop thunderbird and mozilla icons from the tarball, as they are non-free. + (Closes: #394045) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 2 Nov 2006 17:59:48 -0500 + +kdebase (4:3.5.5a-2) unstable; urgency=low + + * Re-add pmount to kdebase's dependencies. It turns out that there remain + strange cases where pmount is needed in conjunction with HAL to do the + right thing. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 13 Oct 2006 17:05:08 -0400 + +kdebase (4:3.5.5a-1) unstable; urgency=high + + * New upstream tarball, with a number of fixes. Also include several + important patches that didn't make the tarball. + + Fixes 'konsole flashes and is unusable' with some focus policies. + (Closes: #391357, #391361) + + This upload, and the last one, must make Etch with their RC fixes, + so urgency=high. + + * Drop the pmount Depends from the kdebase metapackage, since pmount isn't + important with the latest HAL. (Closes: #391502) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 10 Oct 2006 17:12:10 -0400 + +kdebase (4:3.5.5-1) unstable; urgency=low + + [ Debian Qt/KDE Maintainers ] + * New upstream release. + + Reorders the paths which kxkb searches. This should prevent it from + mistakenly thinking that it has found its data; this was breaking + keyboard layouts for many users. (Closes: #382988) + + Fixes kxkb with multiple users - create properly named files in /tmp. + (Closes: #383893) + + Fixes kdesktop crash when copying things to the kde clipboard under + special configuration. (Closes: #386336) + + Fixes kicker external taskbar sizing. (Closes: #373919) + + +++ Changes by Christopher Martin: + + * Join the club by adding full depends on hal and pmount to the kdebase + metapackage. kdebase-kio-plugins will retain recommends for hal and + pmount. This way, people who still really hate udev can simply ditch the + kdebase metapackage, but most users will automatically get the full + Utopia. This is good, since nobody reads recommends anyway, and volume + handling is becoming standard and expected basic functionality. The + kde-desktop task depends on kde-core, a metapackage that in turn + depends on kdebase, so the kde-desktop task will now pull in hal/pmount + as well. (Closes: #384663) + + * Fix typo in /etc/pam.d/kdm-np. (Closes: #381908) + + * Remove /usr/share/apps/kappfinder/apps/Office/lyx.desktop, as lyx-qt + provides its own better .desktop file. (Closes: #383412) + + * Revamp patches/18_default_fonts.diff, not only to sync it with the latest + changes in the KDE_3_5_BRANCH, but also to fix a number of recent problems + with KDE's font handling. These include mismatches between defaults in + different parts of KDE, which led to different apps using different + settings, with respect to the enabling of anti-aliasing, subpixel + rendering, and other settings. Also, set the default font hinting level + to 'full', since anything other than that has the effect of actually + disabling hinting with Debian's fontconfig. This probably led many users + to wonder why their fonts suddenly became so ugly after they ran KControl + and accepted the then-default 'medium' hinting level. (Closes: #381232) + + * Clarify in the kdebase and kdebase-kio-plugins README.Debian files that + plugdev membership through /etc/security/group.conf doesn't cut it. + + * Add Romanian debconf translation, thanks to Stan Ioan-Eugen. + (Closes: #387586) + + * New default background, thanks to Andre L.R. Ferreira. This background was + chosen from a group of images proposed for a standard Debian background by + the Debian Desktop project. This work doesn't look like it will make Etch, + but the old background wasn't super, so we took the one we judged to be + best. + + * Grab a few minipager fixes from the KDE_3_5_BRANCH. + + +++ Changes by Fathi Boudra: + + * Fix typos in libkonq4 description. (Closes: #385148) + + * Re-write kpersonalizer description. (Closes: #385309) + + * Fix typos in kdebase-kio-plugins description. (Closes: #385734) + + * Remove non-free firefox icon. [CM: Add a prune-nonfree script to the + debian packaging that makes it easy to drop the icons from a source + tree, since we must remove the icons from the tarball as well.] + (Closes: #284699) + + +++ Changes by Pierre Habouzit: + + * Add kfreebsd-specific patches to the configure system, ensuring that + all needed files are installed on all platforms, even though the build + system erroneously leaves them out of non-Linux builds. (Closes: #339937) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 4 Oct 2006 18:43:28 -0400 + +kdebase (4:3.5.4-2) unstable; urgency=low + + * KDE_3_5_BRANCH update (up to r567687). + + +++ Changes by Christopher Martin: + + * Re-upload 3.5.4 with a new build hack that disables the use of + --enable-final on slow architectures. This will hopefully allow kdebase + (and other KDE modules) to build on arm and m68k more easily. This should + in turn ease the movement of recent KDE modules into Testing. Thanks to + Adeodato Simo for the fix. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 29 Jul 2006 15:41:35 -0400 + +kdebase (4:3.5.4-1) unstable; urgency=low + + * New upstream release: + + fixes setting of the xrdb resource Xft.antialias to always match what's + configured in the control center, not in ~/.qt/qtrc. (Closes: #377147) + + fixes konqueror crahshes. (Closes: #367090) + + fix a crash in kate at save time. (Closes: #368504) + + +++ Changes by Christopher Martin: + + * Add more manpages from Holger Hartmann. Thanks again! + (Closes: #193527, #373759, #374087) + + * Add libjessie-java to konqueror's Java Suggests, since it is needed for + JSSE in conjunction with GCJ. + + * Add a LSB header to the KDM init script, making KDM usable with a parallel + bootscripts setup. Thanks to Carlos Villegas. (Closes: #376958) + + * 25_khelp_htdig.diff: With the htdig package, searchable indexes should + be usable in the KDE Help Center. (Closes: #313375, #368208, #378408) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 28 Jul 2006 00:04:41 +0200 + +kdebase (4:3.5.5-0ubuntu4) edgy; urgency=low + + * Fix kubuntu_76_ksmserver_suspend.diff to not crash due to uninitialized + HAL context pointer if shutdown options are disabled in logout dialog. + Closes LP #67889 + + -- Luka Renko <lure@ubuntu.com> Tue, 24 Oct 2006 22:09:44 +0200 + +kdebase (4:3.5.5-0ubuntu4) feisty; urgency=low + + * Update kubuntu_73_nomediaioslave_mounthelper.diff, + kubuntu_76_kickermedia.diff and kubuntu_83_media_desktop.diff + patches by Simon Edwards + * Add kubuntu_84_konqueror_stop_reload_button.diff to merge + those 2 buttons. + * Removed kubuntu_84_group_toolbar_viewmode_icons.diff + * Removed kubuntu_69_no_kcontrol_joystick.diff + fixes Malone #53732 + + -- Anthony Mercatante <tonio@ubuntu.com> Thu, 19 Oct 2006 18:35:23 +0200 + +kdebase (4:3.5.5-0ubuntu3) edgy; urgency=low + + * Update kubuntu_73_nomediaioslave_mounthelper.diff to change + media:/ to /media link in about:konqueror page + + -- Anthony Mercatante <tonio@ubuntu.com> Thu, 11 Oct 2006 13:27:23 +0200 + +kdebase (4:3.5.5-0ubuntu2) edgy; urgency=low + + * Build-dep on kdelibs 3.5.5 + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Oct 2006 10:18:56 +0100 + +kdebase (4:3.5.5-0ubuntu1) edgy; urgency=low + + * New upstream release + * 18_default_fonts.diff now kubuntu_18_default_fonts.diff and first hunk + removed to apply + * 28_kdebase_rubberband.diff now kubuntu_28_kdebase_rubberband.diff and hunk + removed to apply + * kubuntu_14_hide_konquerorsu_menu_entry.diff updated + * kubuntu_20_kdesu_sudo.diff updated, merged upstream + * kubuntu_35_hide_klipper_menu_entry.diff updated + * kubuntu_73_nomediaioslave_mounthelper.diff updated + * kubuntu_75_kicker_taskbar_resize.diff removed, fixed upstream + * kubuntu_76_kickermedia.diff updated + * kubuntu_83_media_desktop.diff updated + * Use --with-sudo-kdesu-backend and build-dep on sudo + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 3 Oct 2006 10:56:06 +0000 + +kdebase (4:3.5.4-0ubuntu28) edgy; urgency=low + + * Add kubuntu_84_group_toolbar_viewmode_icons.diff to get + icons grouped in the viewmode actionlist. + * Update kubuntu_73_nomediaioslave_mounthelper.diff to change + media:/ to /media link in about:konqueror page + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 25 Sep 2006 21:46:23 +0200 + +kdebase (4:3.5.4-0ubuntu27) edgy; urgency=low + + * Update kubuntu_73_nomediaioslave_mounthelper.diff + by Simon Edwards + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 25 Sep 2006 12:44:23 +0200 + +kdebase (4:3.5.4-0ubuntu26) edgy; urgency=low + + * Install kdm at init level 13 + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 22 Sep 2006 01:58:38 +0100 + +kdebase (4:3.5.4-0ubuntu25) edgy; urgency=low + + * Rebuild on latest cdbs to change .pot files to UTF8 + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 20 Sep 2006 13:09:27 +0100 + +kdebase (4:3.5.4-0ubuntu24) edgy; urgency=low + + * Update kubuntu_73_nomediaioslave_mounthelper.diff + by Simon Edwards + + -- Anthony Mercatante <tonio@ubuntu.com> Tue, 19 Sep 2006 23:55:23 +0200 + +kdebase (4:3.5.4-0ubuntu23) edgy; urgency=low + + * Update kubuntu_76_ksmserver_suspend.diff to use suspend/hibernate icons + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 19 Sep 2006 12:20:00 +0100 + +kdebase (4:3.5.4-0ubuntu22) edgy; urgency=low + + * Improved kubuntu_73_nomediaioslave_mounthelper.diff and + kubuntu_76_kickermedia.diff by Simon Edwards + * Added kubuntu_83_media_desktop to fix Desktop icons URLs + for /media, by Simon Edwards + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 18 Sep 2006 21:08:23 +0200 + +kdebase (4:3.5.4-0ubuntu21) edgy; urgency=low + + * Add kubuntu_82_safari_useragent.diff to update user agent + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 18 Sep 2006 16:32:41 +0100 + +kdebase (4:3.5.4-0ubuntu20) edgy; urgency=low + + * Improved kubuntu_73_nomediaioslave_mounthelper.diff + by Simon Edwards + * Improved kubuntu_76_ksmserver_suspend.diff by + Luka Renko + + -- Anthony Mercatante <tonio@ubuntu.com> Thu, 14 Sep 2006 19:19:23 +0200 + +kdebase (4:3.5.4-0ubuntu19) edgy; urgency=low + + * Added kubuntu_80_kdm_grub.diff (closes #57066) + * Added kubuntu_81_search_engines_config.diff (closes #60058) + + -- Anthony Mercatante <tonio@ubuntu.com> Tue, 12 Sep 2006 08:26:23 +0200 + +kdebase (4:3.5.4-0ubuntu18) edgy; urgency=low + + * Improved patch kubuntu_79_kdm_halt.diff since kcontrol connection + manager module also hardcodes the setting, instead of reading kdm + settings (evil) + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 13:19:23 +0200 + +kdebase (4:3.5.4-0ubuntu17) edgy; urgency=low + + * Added patch kubuntu_79_kdm_halt.diff to change the shutdown command + (closes #59134) + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 11 Sep 2006 11:50:23 +0200 + +kdebase (4:3.5.4-0ubuntu16) edgy; urgency=low + + * Added binary-install/klipper entry in debian rule to fix klipperrc + file (closes #56377) + + -- Anthony Mercatante <tonio@ubuntu.com> Sat, 9 Sep 2006 00:00:23 +0200 + +kdebase (4:3.5.4-0ubuntu15) edgy; urgency=low + + * Improved kubuntu_05_kdm_theme_config.diff (closes #57428) + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 8 Sep 2006 15:06:20 +0200 + +kdebase (4:3.5.4-0ubuntu14) edgy; urgency=low + + * Added kubuntu_78_kcontrol_hide_component_chooser.diff (closes #59435) + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 8 Sep 2006 11:43:20 +0200 + +kdebase (4:3.5.4-0ubuntu13) edgy; urgency=low + + [ Jonathan Riddell ] + * Update kubuntu_68_xinerama.diff with improved patch from Lubos Lunak + + [ Brandon Holtsclaw ] + * Added kubuntu_76_kickermedia.diff - Patch for the "Storage Media" kicker applet + to fit into simes other patches + * Added kubuntu_77_kiosystem.diff - system:/. The contents of system:/ now go to + normal directories instead of media:/ etc. This also fixes the "System Menu" + kicker applet + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Fri, 1 Sep 2006 10:59:47 -0500 + +kdebase (4:3.5.4-0ubuntu12) edgy; urgency=low + + * debian/patches/kubuntu_76_ksmserver_suspend.diff: provides Suspend + and Hibernate buttons on KDE logout dialog. Uses HAL/dbus to detect + supported actions and to perform suspend/hibernate. + + -- Luka Renko <lure@ubuntu.com> Fri, 01 Sep 2006 14:33:00 +0200 + +kdebase (4:3.5.4-0ubuntu11) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge <slomo@ubuntu.com> Wed, 30 Aug 2006 13:13:55 +0200 + +kdebase (4:3.5.4-0ubuntu10) edgy; urgency=low + + * Changed kdebase-kio-plugins.install to remove the trash icon klipper + from system applet + + -- Anthony Mercatante <tonio@ubuntu.com> Sun, 27 Aug 2006 21:36:20 +0200 + +kdebase (4:3.5.4-0ubuntu9) edgy; urgency=low + + [ Jonathan Riddell ] + * Add kubuntu_74_sidebar_icons.diff from http://bugs.kde.org/101636 + "All icons in the services sidebar become folders when pressing plus sign" + * Add kubuntu_75_kicker_taskbar_resize.diff from http://bugs.kde.org/128552 + " "Length" has no effect if External TaskBar is at the side of the screen" + + [ Brandon Holtsclaw ] + * Modified kubuntu_73_nomediaioslave_mounthelper.diff from + Simon Edwards, https://wiki.ubuntu.com/KubuntuKDEMedia with new updates + + -- Brandon Holtsclaw <imbrandon@kubuntu.org> Tue, 22 Aug 2006 20:22:20 -0500 + +kdebase (4:3.5.4-0ubuntu8) edgy; urgency=low + + * Modified kubuntu_70_hide_printers_desktop.diff or printers to + still appear in SystemSettings whenever hidden in K menu + * Modified konqueror.install to remove konq sidebar system entry. + Causes a crash because of the kicker system applet patch + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 18 Aug 2006 20:22:20 +0200 + +kdebase (4:3.5.4-0ubuntu7) edgy; urgency=low + + [ Jonathan Riddell ] + * Add kubuntu_73_nomediaioslave_mounthelper.diff from + Simon Edwards, http://www.kdedevelopers.org/node/2231 + + [ Luka Renko ] + * Moved Ubuntu keycode -> xkeysym mapping from kdeutils/kmilo + * debian/ubuntu.xmodmap: Ubuntu laptop keycode -> xkeysym mapping + * debian/80ubuntu-xmodmap: Xsession startup script for Ubuntu laptop xmodmap + * debian/patches/kubuntu_72_kxkb_xmodmap.diff: reload Ubuntu laptop xmodmap on + keyboard layout switch (after setxkbmap) + + -- Luka Renko <lure@ubuntu.com> Sun, 20 Aug 2006 13:36:55 +0200 + +kdebase (4:3.5.4-0ubuntu6) edgy; urgency=low + + * Added kubuntu_70_hide_printers_desktop.diff to hide the printers + configuration entry in kmenu. + + -- Anthony Mercatante <tonio@ubuntu.com> Fri, 18 Aug 2006 15:17:20 +0200 + +kdebase (4:3.5.4-0ubuntu5) edgy; urgency=low + + * Fix string in kubuntu_67_easy_zeroconf.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 9 Aug 2006 11:25:20 +0000 + +kdebase (4:3.5.4-0ubuntu4) edgy; urgency=low + + * Add missing includes to kubuntu_67_easy_zeroconf.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 7 Aug 2006 09:28:13 -0400 + +kdebase (4:3.5.4-0ubuntu3) edgy; urgency=low + + * Add warning message dialogue when enabling Zeroconf in + in kubuntu_67_easy_zeroconf.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 1 Aug 2006 17:26:01 +0000 + +kdebase (4:3.5.4-0ubuntu2) edgy; urgency=low + + * Add kdebase-data replaces kcontrol << 3.5.4 + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 1 Aug 2006 15:10:17 +0000 + +kdebase (4:3.5.4-0ubuntu1) edgy; urgency=low + + * New upstream release + * Add kubuntu_69_no_kcontrol_joystick.diff, compilation is + broken with current linux headers + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Jul 2006 10:43:22 +0000 + +kdebase (4:3.5.3-2ubuntu8) edgy; urgency=low + + * Fix path to executables in kubuntu_67_easy_zeroconf.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 24 Jul 2006 14:49:07 +0100 + +kdebase (4:3.5.3-2ubuntu7) edgy; urgency=low + + * Add kubuntu_68_xinerama.diff from + http://ktown.kde.org/~seli/xinerama/ + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 20 Jul 2006 18:41:03 +0100 + +kdebase (4:3.5.3-2ubuntu6) edgy; urgency=low + + * Remove bdftopcf from build-deps, not in xfont-utils + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 20 Jul 2006 14:57:22 +0100 + +kdebase (4:3.5.3-2ubuntu5) edgy; urgency=low + + * Update kubuntu_40_xmkmf.diff for new X packages and remove + kubuntu_64_xbindir.diff + * Add kubuntu_67_easy_zeroconf.diff for + https://launchpad.net/distros/ubuntu/+spec/kubuntu-easy-zeroconf + * Add kubuntu_00_autoconf2.60.diff for Autoconf 2.60 compatibility + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 19 Jul 2006 23:02:19 +0100 + +kdebase (4:3.5.3-2ubuntu4) edgy; urgency=low + + * Install directory.trash into unused + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 17 Jul 2006 21:45:33 +0000 + +kdebase (4:3.5.3-2ubuntu3) edgy; urgency=low + + * Add kubuntu_66_xscreensaver.diff from + http://bugs.kde.org/128610 + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Jul 2006 14:44:38 +0000 + +kdebase (4:3.5.3-2ubuntu2) edgy; urgency=low + + * Build-dep on latest kdelibs, fixes Qt binary compatibility break + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 28 Jun 2006 16:18:05 +0000 + +kdebase (4:3.5.3-2ubuntu1) edgy; urgency=low + + * Merge with Debian + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 27 Jun 2006 09:13:53 +0000 + +kdebase (4:3.5.3-2) unstable; urgency=medium + + * KDE_3_5_BRANCH update (up to r549661). + + Fixes kpager crash. (Closes: #370158) + + * Urgency medium for RC kpager crash fix. + + +++ Changes by Christopher Martin: + + * Add a small patch to make the Printer panel available from the KMenu + again. + + * Add numerous manpages from Holger Hartmann. Thanks! + (Closes: #370140, #370164, #370358) + + * Make kcontrol suggest ntpdate | ntp-simple, since the Date and Time panel + can use NTP to set up the clock. (Closes: #369899) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 9 Jun 2006 09:51:32 -0400 + +kdebase (4:3.5.3-1) unstable; urgency=low + + * New upstream release. + + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127) + + fix problems with systram. (Closes: #347320) + + +++ Changes by Christopher Martin: + + * Add konqueror Suggests for java, since java works (more or less) + with the DFSG-free gij-4.1 and libgcj7-awt. + + * Lower konqueror's Recommends on ksvg to a Suggests. + + * Improve kpager's package description. Thanks to David Liontooth. + (Closes: #366476) + + * Update the kate manpage. (Closes: #347883) + + * Manually add /usr/bin/X11 to the KDM's default session path, as otherwise + systems still running X11R6.9 won't be able to find X binaries, which can + cause the login process to fail under certain circumstances. This bit of + cruft (for X11R7 users) should be harmless, and can be removed post-Etch. + (Closes: #367072) + + +++ Changes by Pierre Habouzit: + + * Move arch indep files from kcontrol into kdebase-data. (Closes: #233379) + (still *.desktop files remains in kcontrol to avoid beeing advertised from + KDE menus with no corresponding binaries). + + * Add 'ru' debconf templates translation, thanks to Yuriy Talakan. + (Closes: #367206) + + * Add konqueror.presubj (konqueror is responsible of 25% of the kdebase bug + reports) to ask for more precise bug reports, because often they lack the + fundamental information necessary to make them useful. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 29 May 2006 09:55:11 +0200 + +kdebase (4:3.5.2-2) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Now that menu-xdg+menu can provide xsession .desktop files for window + managers, add /var/lib/menu-xdg/xsessions to kdmrc's default list of + places to search. Window managers should continue to provide their + own .desktop files, however, since they will be more customized and + won't force users to install the menu package. This is merely a + fallback. (Closes: #360919) + + * Make kdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way + out. Adjust other paths in kdmrc as well. kdm should now work better with + X.Org 7. (Closes: #362924) + + * Patch kdm so that if it can't find the X executable in kdmrc (now + /usr/bin/X by default), then try /usr/X11R6/bin/X, then finally + /usr/bin/X. This should keep kdm working for users who have a partial or + botched dist-upgrade, or neglected to permit the installation of an + up-to-date kdmrc. + + * Revamp /etc/pam.d/kdm and the other pam files. They should now find the + new /etc/default/locale language settings. (Closes: #361089, #361163) + + * Remove xlibs-static-pic build-dependency, and replace it with + libfontenc-dev, for the more modular X.Org 7. Also add libxkbfile-dev to + the build-depends. (Closes: #363438) + + * Improve konqueror's use of alternatives, by slaving the konqueror manpage + to the x-www-browser manpage. Thanks to Magnus Holmgren. (Closes: #363076) + + * Fix klipper description typo. (Closes: #364171) + + +++ Changes by Pierre Habouzit. + + * Add gl.po to the debconf templates. (Closes: #361208) + + * Improve konsole's use of alternatives, by slaving the konsole manpage to + the x-terminal-emulator manpage. Thanks to Magnus Holmgren. + (Closes: #363280) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 22 Apr 2006 20:00:39 -0400 + +kdebase (4:3.5.2-1) unstable; urgency=low + + * New upstream release. + + Fixes the klipper + OpenOffice.org problems. + (Closes: #350930) + + * KDE_3_5_BRANCH update (up to r523654). + + +++ Changes by Christopher Martin: + + * Add a kpersonalizer manpage from Joe Zonker Brockmeier. Thanks. + (Closes: #327395) + + * Make the KDM option "Restart X Server" visible by default again. + + * Fix the logitechmouse udev rules. Thanks to Henrique de Moraes Holschuh + for spotting the problems. (Closes: #359751, #359773) + + +++ Changes by Pierre Habouzit: + + * Add a recommends on ksvg for konqueror. (Closes: #200008) + + * Add a note on how to read Kdm help, since no "help" button exists for it. + (Closes: #294126) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 28 Mar 2006 20:19:46 -0500 + +kdebase (4:3.5.1-1) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to + the build-depends. (Closes: #348583) + + * Merge startkde manpage (and maintainer script patch to fully integrate it) + from Philipp Grau. Thanks. (Closes: #348501) + + * Upload to unstable. + + +++ Changes by Luk Claes: + + * Add Italian debconf translation (thanks to Luca Monducci). + (Closes: #349344) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 Jan 2006 19:18:45 -0500 + +kdebase (4:3.5.0-4) unstable; urgency=low + + +++ Changes by Isaac Clerencia + + * Add kdnssd kcontrol module files to kcontrol package + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 11 Jan 2006 23:05:12 +0100 + +kdebase (4:3.5.0-3) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Install kdm's NEWS file in all kdebase packages. This ensures that + apt-listchanges will display the news to all users. (Closes: #344947) + + +++ Changes by Adeodato Simó: + + * Upload to unstable. + + * KDE_3_5_BRANCH update (up to r494868). + + * Use the new --with-usbids configure option to use the usb.ids file + provided by usbutils instead of the one included in the source. Make + kcontrol depend on usbutils for this, and do not ship usb.ids anymore. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 7 Jan 2006 19:11:37 +0100 + +kdebase (4:3.5.0-2) experimental; urgency=low + + * Upload to experimental. + + * KDE_3_5_BRANCH update (up to r488815). + + +++ Changes by Christopher Martin: + + * Add strict build-depends on dbus and hal, ensuring that we build against + the latest packages. (Closes: #332647) + + * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should + be fixed. (Closes: #342980) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 15 Dec 2005 19:25:37 -0500 + +kdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low + + * SECURITY UPDATE: KDM symlink attack vulnerability + * Add kubuntu_65_kdm_symlink_vunerability.diff + * KDM allows the user to select the session type for login. This + setting is permanently stored in the user home directory. By + using a symlink attack, KDM can be tricked into allowing the + user to read file content that would otherwise be unreadable + to this particular user. + * References: + CVE-2006-2449 + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 12 Jun 2006 16:01:48 +0000 + +kdebase (4:3.5.2-0ubuntu26) dapper; urgency=low + + * Add kubuntu_64_xbindir.diff to set XBINDIR to /usr/bin + Fixed upgrades when xserver-xorg is not installed + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 22 May 2006 17:48:01 +0300 + +kdebase (4:3.5.2-0ubuntu25) dapper; urgency=low + + * Fix kubuntu_53_kwallet_config.diff to not install kwallet + file in wrong directory, closes Malone #45999 + * Install filemanagement and webbrowsing konqueror profiles, + closes Malone #45004 + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 22 May 2006 17:09:21 +0300 + +kdebase (4:3.5.2-0ubuntu24) dapper; urgency=low + + * debian/cdbs/kde.mk: + - added dh_iconcache. + + -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 18 May 2006 21:03:58 +0200 + +kdebase (4:3.5.2-0ubuntu23) dapper; urgency=low + + * Don't install Konqueror default profiles + + -- Anthony Mercatante <tonio@ubuntu.com> Thu, 12 May 2006 02:00:44 +0200 + +kdebase (4:3.5.2-0ubuntu22) dapper; urgency=low + + * Update kubuntu_20_kdesu_sudo.diff to fix run as foo message in kdesu + with -u switch (Closes: Malone #41184) + + -- Raphaël Pinson <raphink@ubuntu.com> Thu, 11 May 2006 12:12:44 +0200 + +kdebase (4:3.5.2-0ubuntu21) dapper; urgency=low + + * Make sure all patches unapplied before uploading + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 10 May 2006 18:18:50 +0300 + +kdebase (4:3.5.2-0ubuntu20) dapper; urgency=low + + * Add kubuntu_63_pot_generation_path.diff to create + some .pot files in the correct directory. + * Edit kde.mk to be able to find extractattr for .pot generation + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 9 May 2006 18:08:02 +0300 + +kdebase (4:3.5.2-0ubuntu19) dapper; urgency=low + + * Add kubuntu_62_genkdmconf_fix.diff, closes Malone #39599 + + -- Frode M. Doeving <frode@lnix.net> Mon, 1 May 2006 15:25:48 +0100 + +kdebase (4:3.5.2-0ubuntu18) dapper; urgency=low + + * Fix wallpaper in kubuntu_05_kdm_theme_config.diff + * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of + gtk_qt_engine if gnome or xfce are already installed (Malone #36256) + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 1 May 2006 15:02:46 +0100 + +kdebase (4:3.5.2-0ubuntu17) dapper; urgency=low + + * Remove kubuntu_36_hide_kjobviewer_menu_entry.diff + handy to be able to get at print job viewer + Closes Malone #38573 + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 29 Apr 2006 16:05:23 +0100 + +kdebase (4:3.5.2-0ubuntu16) dapper; urgency=low + + * Update kubuntu_05_kdm_theme_config.diff for dapper wallpaper + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 27 Apr 2006 15:45:33 +0100 + +kdebase (4:3.5.2-0ubuntu15) dapper; urgency=low + + * Removed kubuntu_17_hide_desktop_trash.diff and + kubuntu_46_no_desktop_files.diff and install desktop files in + /usr/share/kdesktop/unused + + -- Anthony Mercatante <tonio@ubuntu.com> Wed, 26 Apr 2006 03:01:24 +0200 + +kdebase (4:3.5.2-0ubuntu14) dapper; urgency=low + + * Added previously removed kubuntu_54_system_protocol_home_dir.diff make + system:/ use /home/foo not system:/home/foo + * Removed system tab from konqueror's sidebar + * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of + gtk_qt_engine if gnome or xfce are already installed (Malone #36256) + * Added kubuntu_61_kdeprint_admin.diff, makes kdeprint admin mode work + (Malone #39867) + + -- Anthony Mercatante <tonio@ubuntu.com> Mon, 24 Apr 2006 21:16:19 +0200 + +kdebase (4:3.5.2-0ubuntu13) dapper; urgency=low + + * Add kubuntu_59_lisa_popup.diff to prevent displaying a popup error when + the lisa package is not installed. + + -- Raphaël Pinson <raphink@ubuntu.com> Sun, 23 Apr 2006 23:19:19 +0200 + +kdebase (4:3.5.2-0ubuntu12) dapper; urgency=low + + * Edit debian/cdbs/kde.mk to mark .po files as UTF-8 + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 21 Apr 2006 19:14:28 +0100 + +kdebase (4:3.5.2-0ubuntu11) dapper; urgency=low + + * Fix serverguide URL in kubuntu_33_kubuntuify_about.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 21 Apr 2006 16:12:54 +0100 + +kdebase (4:3.5.2-0ubuntu10) dapper; urgency=low + + * Add missing "|| true" in case the rmdir fails. + + -- Scott James Remnant <scott@ubuntu.com> Fri, 21 Apr 2006 11:09:44 +0100 + +kdebase (4:3.5.2-0ubuntu9) dapper; urgency=low + + * Drop hotplug script entirely and update udev rules to Ubuntu standards. + + -- Scott James Remnant <scott@ubuntu.com> Thu, 20 Apr 2006 12:29:01 +0100 + +kdebase (4:3.5.2-0ubuntu8) dapper; urgency=low + + * Add kubuntu_58_kwin_branch.diff fixes crash on alt-tab and + focus policies + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:35:56 +0000 + +kdebase (4:3.5.2-0ubuntu7) dapper; urgency=low + + * konqueror: Put the system tab back in sidebar now that we deal with the + kio properly. + + -- Raphaël Pinson <raphink@ubuntu.com> Fri, 14 Apr 2006 00:59:01 +0200 + +kdebase (4:3.5.2-0ubuntu6) dapper; urgency=low + + * Remove kubuntu_54_system_protocol_home_dir.diff, restricting + protocols in .desktop files is better. + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 13 Apr 2006 14:45:35 +0100 + +kdebase (4:3.5.2-0ubuntu5) dapper; urgency=low + + * Fix compile error in kubuntu_33_kubuntuify_about.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 5 Apr 2006 16:10:20 +0100 + +kdebase (4:3.5.2-0ubuntu4) dapper; urgency=low + + * Remove obsolete Quick Guide from + kubuntu_33_kubuntuify_about.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 4 Apr 2006 12:10:33 +0100 + +kdebase (4:3.5.2-0ubuntu3) dapper; urgency=low + + * konqueror: Remove system tab from sidebar (Close: Malone #33917) + + -- Raphaël Pinson <raphink@ubuntu.com> Fri, 31 Mar 2006 14:08:35 +0200 + +kdebase (4:3.5.2-0ubuntu2) dapper; urgency=low + + * kdebase-kio-plugins: Remove trash from the system applet + (Close: Malone #14393). + * kdesktop: Remove unused invisible desktop files on the Desktop. + + -- Raphaël Pinson <raphink@ubuntu.com> Wed, 29 Mar 2006 18:14:35 +0200 + +kdebase (4:3.5.2-0ubuntu1) dapper; urgency=low + + * New upstream release + * Update 25_khelp_htdig.diff + * Remove kubuntu_44_systray_show.diff + * Remove kubuntu_45_kxkb_xx_XX_layouts.diff + * Remove kubuntu_49_xkb_path.diff + * Remove kubuntu_39_konqueror_focus_location_bar.diff + * Remove kubuntu_47_autostart_kdeonly.diff + * Add kubuntu_56_kmenuedit_doc.diff from Rocco Stanzione Malone No 36636 + * Add kubuntu_57_kxbd_patch.diff from Raphael Pinson, fixes xkbd path + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Mar 2006 11:22:14 +0000 + +kdebase (4:3.5.1-0ubuntu14) dapper; urgency=low + + * Add kubuntu_55_kdm_usplash_down.diff run usplash on exit from KDM + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 17 Mar 2006 12:26:58 +0000 + +kdebase (4:3.5.1-0ubuntu13) dapper; urgency=low + + * Update kdm background colour in kubuntu_05_kdm_theme_config.diff + to match current artwork + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Mar 2006 21:17:36 +0000 + +kdebase (4:3.5.1-0ubuntu12) dapper; urgency=low + + [ Anthony Mercatante ] + * Add kubuntu_53_kwallet_config.diff copy a default + KWallet config for new users + * Add kubuntu_54_system_protocol_home_dir.diff make + system:/ use /home/foo not system:/home/foo keep + Kaffeine etc happy + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 6 Mar 2006 12:10:14 +0000 + +kdebase (4:3.5.1-0ubuntu11) dapper; urgency=low + + * Add kubuntu_52_gtk_qt_engine_config.diff install + gtk-qt-engine config files if suitable + * Patch by Anthony Mercatante <tonio@ubuntu.com> + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 27 Feb 2006 17:30:59 +0000 + +kdebase (4:3.5.1-0ubuntu10) dapper; urgency=low + + * Add kubuntu_50_kate_desktop.diff use existing Kate session + * Add kubuntu_51_kdmrc_options.diff add back restart X option + * Patches by Anthony Mercatante <tonio@ubuntu.com> + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 27 Feb 2006 15:18:06 +0000 + +kdebase (4:3.5.1-0ubuntu9) dapper; urgency=low + + * Fix URLs on kubuntu_33_kubuntuify_about.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 23 Feb 2006 13:48:01 +0000 + +kdebase (4:3.5.1-0ubuntu8) dapper; urgency=low + + * Add new line in kubuntu_33_kubuntuify_about.diff to fix + layout of about page + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Feb 2006 11:46:30 +0000 + +kdebase (4:3.5.1-0ubuntu7) dapper; urgency=low + + * Update kubuntu_33_kubuntuify_about.diff for dapper + * Add kubuntu_48_xkb_path.diff to fix keyboard layout lists in kxkb config + window (Closes: Malone #31165). + Patch by Raphael Pinson <raphink@ubuntu.com> + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Feb 2006 23:05:11 +0000 + +kdebase (4:3.5.1-0ubuntu6) dapper; urgency=low + + * Add kubuntu_48_hide_display.diff to hide display module + from KControl, replaced by Guidance 0.6 displayconfig + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 15 Feb 2006 15:26:25 +0000 + +kdebase (4:3.5.1-0ubuntu5) dapper; urgency=low + + * Fix install path for Home.desktop and System.desktop + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Feb 2006 16:22:53 +0000 + +kdebase (4:3.5.1-0ubuntu4) dapper; urgency=low + + * Do install System.desktop or Home.desktop kdesktop icons and add + kubuntu_46_no_desktop_files.diff to hide them + (makes it easier to turn them back on) + * Add kubuntu_47_autostart_kdeonly.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 9 Feb 2006 13:26:36 +0000 + +kdebase (4:3.5.1-0ubuntu3) dapper; urgency=low + + * Add kubuntu_45_kxkb_xx_XX_layouts.diff fix support for + xx_XX layouts in kxkb + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 3 Feb 2006 11:41:13 +0000 + +kdebase (4:3.5.1-0ubuntu2) dapper; urgency=low + + * Added a desktop file for kdcop and added a line to + debian/kdebase-bin.install to install it in the system + (Closes : Malone #30112) + * Patch from Raphaël Pinson <raphink@raphink.net> + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 31 Jan 2006 02:14:55 +0100 + +kdebase (4:3.5.1-0ubuntu1) dapper; urgency=low + + * New upstream release + * Add kubuntu_44_systray_show.diff, advised by upstream to + ensure systray apps dock properly + * Lower dbus build-dep for backporting + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 23 Jan 2006 14:26:06 +0000 + +kdebase (4:3.5.0-0ubuntu16) dapper; urgency=low + + * Add kubuntu_43_kdesu_terminal_output.diff to make kdesu + have terminal output + * Remove xlibs-static-pic from build-deps + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 20 Jan 2006 15:13:49 +0000 + +kdebase (4:3.5.0-0ubuntu15) dapper; urgency=low + + * kcontrol replaces old kdebase-bin for kcm_kdnssd.desktop + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 17 Jan 2006 15:20:42 +0000 + +kdebase (4:3.5.0-0ubuntu14) dapper; urgency=low + + * Remove /usr/share/apps/konsole/fonts/fonts.dir from konsole.install + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 20:28:48 +0000 + +kdebase (4:3.5.0-0ubuntu13) dapper; urgency=low + + * Tighten build-dep to kdelibs 4:3.5.0-0ubuntu9 + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 18:22:00 +0000 + +kdebase (4:3.5.0-0ubuntu12) dapper; urgency=low + + * Tighten build-dep to kdelibs 4:3.5.0-0ubuntu8 + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 12 Jan 2006 15:34:03 +0000 + +kdebase (4:3.5.0-0ubuntu11) dapper; urgency=low + + * Add kubuntu_42_konsole_root_shell.diff for a working root shell via sudo + (Closes: ubuntu bugzilla #12343) + + -- Stephan Hermann <sh@sourcecode.de> Wed, 11 Jan 2006 18:42:39 +0100 + +kdebase (4:3.5.0-0ubuntu10) dapper; urgency=low + + * Remove kubuntu_41_kcmdnssd_friendly_name.diff, which shouldn't + have been there + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 11 Jan 2006 14:48:28 +0000 + +kdebase (4:3.5.0-0ubuntu9) dapper; urgency=low + + * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path + * Install kcm_kdnssd in kcontrol + * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module + more recognisable + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 10 Jan 2006 23:51:15 +0000 + +kdebase (4:3.5.0-0ubuntu8) dapper; urgency=low + + * Change xmkmf build-dep to imake + * Remove build-dep on xutils (was for imake) + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 10 Jan 2006 22:16:38 +0000 + +kdebase (4:3.5.0-0ubuntu7) dapper; urgency=low + + * Update 10_kdmrc_defaults_kubuntu.diff changing Debian to Kubuntu + and rename to kubuntu_10_kdmrc_defaults_kubuntu.diff + * Remove kdm dependency on kubuntu-default-settings, setting KDM + theme now scripted in kubuntu-default-settings + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 10 Jan 2006 00:26:23 +0000 + +kdebase (4:3.5.0-0ubuntu6) dapper; urgency=low + + * Add kubuntu_39_konqueror_focus_location_bar.diff fix + http://bugs.kde.org/117031 + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 6 Jan 2006 00:49:25 +0000 + +kdebase (4:3.5.0-0ubuntu5) dapper; urgency=low + + * rebuild against latest dbus, updated dependencies + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 20 Dec 2005 22:05:42 +0100 + +kdebase (4:3.5.0-0ubuntu4) dapper; urgency=low + + * Remove printmgr.desktop from install target + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 17 Dec 2005 22:29:48 +0000 + +kdebase (4:3.5.0-0ubuntu3) dapper; urgency=low + + * Add kubuntu_38_ksysguard_pot.diff fix ksysguard .pot generation + * Edit kde.mk to allow for fail on gettext + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 17 Dec 2005 18:21:40 +0000 + +kdebase (4:3.5.0-0ubuntu2) dapper; urgency=low + + * Do not install System.desktop or Home.desktop kdesktop icons + * Add kubuntu_34_no_duplicate_desktop_file.diff for + duplicate printer .desktop files + * Add kubuntu_35_hide_klipper_menu_entry.diff autostarts by default + * Add kubuntu_36_hide_kjobviewer_menu_entry.diff starts when printing + * Add kubuntu_37_hide_kdeprintfax_menu_entry.diff kdeprintfax + is available when printing with Print to Fax + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 21:51:29 +0000 + +kdebase (4:3.5.0-0ubuntu1) dapper; urgency=low + + * New upstream release + * Remove GCC 3.4 on hppa + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 6 Dec 2005 12:27:26 +0000 + +kdebase (4:3.5-rc2-0ubuntu2) dapper; urgency=low + + * Tighten build-dep to pick up new kdelibs4-dev with libattr1-dev + and libacl1-dev + * Remove gettext-kde and kdesdk-scripts from build-dep, now in kdelibs4-dev + + -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 26 Nov 2005 00:22:58 +0000 + +kdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low + + * New upstream pre-release + * Tighten kdelibs-dev build-dep for libstdc++ transition + * kdm depends on xauth not xbase-clients + * Update 18_default_fonts.diff + * Generate .pot files + * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5 + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Nov 2005 17:46:39 +0000 + +kdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low + + * New upstream pre-release + * Sync with Debian + * Update kubuntu_05_kdm_theme_config.diff + * Update kubuntu_16_hide_kpager_menu_entry.diff + * Update kubuntu_19_kdm_zsh_emulate.diff + * Update kubuntu_25_kcontrol_only_in_kde.diff + * Update kubuntu_30_startkde_background_colour.diff + * Update kubuntu_32_usplash_console_font.diff + * konqueror replaces old kcontrol + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 10 Nov 2005 23:29:58 +0000 + +kdebase (4:3.5.0-1) alioth; urgency=low + + * New upstream release. + + * Fixed in this release: + + + A bug that caused switching to Administrator mode in KControl to + fail on occasion is resolved. (Closes: #306951) + + +++ Changes by Christopher Martin: + + * In light of upstream changes, remove the xfonts-konsole package. Instead, + ship bitmap fonts as part of konsole. + + * Improve kcontrol's Logitech mouse support in conjunction with udev. + However, kcontrol + udev now requires kernel 2.6.14 or later. Older + kernels are still supported with the hotplug package. + + * Bump DH_COMPAT to 5. No changes. + + * Add a kdebase-dbg package for helping to trace problems. + + +++ Changes by Ana Beatriz Guerrero Lopez: + + * Add manpage for Konsole. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 30 Nov 2005 02:29:16 -0500 + +kdebase (4:3.4.3-3) unstable; urgency=low + + * Upload to unstable, rebuilding against kdelibs4c2a. + + * KDE_3_4_BRANCH update (up to r484262). + + +++ Changes by Christopher Martin: + + * Temporarily bump build-depends on dbus to >= 0.23.4-8, ensuring that + we build against a package that doesn't link against the pre-transition + kdelibs4c2. + + * Add "noextendedglob" to zsh's options when reading the X startup scripts + for kdm. This works around some of its quirks. (Closes: #336305) + + * Backport a fix from KDE 3.5 for a bug that caused switching to + Administrator mode in KControl to fail on occasion. (Closes: #306951) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 30 Nov 2005 01:14:06 +0100 + +kdebase (4:3.4.3-2) experimental; urgency=low + + +++ Changes by Christopher Martin: + + * Add "chmod +x" for usermap.pl in debian/rules, to ensure that the package + builds... + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 18 Oct 2005 17:49:19 -0400 + +kdebase (4:3.4.3-1) experimental; urgency=low + + * New upstream release. + + +++ Changes by Christopher Martin: + + * Add a small addition to the "Improving KDE" patch selection used in + Debian. The rounded icon text selection now applies on the desktop + as well. (Closes: #329484) + + * Increase konsole's x-terminal-emulator priority from 20 to 35, placing it + above xterm. (Closes: #332223) + + * Adapt kcontrol's hotplug support for special control of Logitech mice to + work with udev as well. + + * Add the Swedish debconf translation by Daniel Nylander. (Closes: #333798) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 15 Oct 2005 14:00:13 -0400 + +kdebase (4:3.4.2-4) unstable; urgency=medium + + +++ Changes by Christopher Martin: + + * Fix kicker's dependency on kdebase-data so that a binNMU does not render + kdebase uninstallable. This is currently a problem on ia64. + (Closes: #335285) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Oct 2005 08:25:27 -0400 + +kdebase (4:3.4.2-3) unstable; urgency=low + + * KDE_3_4_BRANCH update (up to r458655). This includes a fix for a local + root exploit, CAN-2005-2494, in the kcheckpass binary (Closes: #327039) + + +++ Changes by Christopher Martin: + + * Add a NEWS entry that explains the KDM upgrade process for users moving + from KDM 3.3.x, as well as KDM's new behaviour regarding login scripts. + (Closes: #326542, #327191) + + * Add a patch from the "Improving KDE" set that eliminates a superfluous + border around kicker's systray that appeared on mouseover. + + * Add another "Improving KDE" patch that allows the selection of a special + tranparent selection rectangle (off by default) to be made from the + Control Center's Style module. Temporarily bump our kdelibs build-depends, + to ensure that we build against a similarly patched Qt and kdelibs. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 16 Sep 2005 16:59:45 -0400 + +kdebase (4:3.4.2-2) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * For kdebase-data, add conflicts against old versions of kcontrol, kwin, + and kicker. This should prevent users from unwittingly upgrading + kdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level. + This had resulted in kcontrol breaking and other assorted issues. + (Closes: #325592) + + +++ Changes by Adeodato Simó: + + * Build with g++-3.4 on arm, m68k and hppa; kdebase also makes gcc 4.0 ICE + as described in #323133. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 02 Sep 2005 10:59:00 +0200 + +kdebase (4:3.4.2-1) unstable; urgency=low + + * New upstream release. + + * KDE_3_4_BRANCH update. + + * Bugs reported in the Debian BTS fixed by this release: + + - kdm uses /dev/urandom instead of /dev/random as the default source + of entropy. This solves myriad issues on low-entropy systems. + (Closes: #240027, #294267, #298254, #320838) + + - "-nolisten tcp" no longer prevents kdm from connecting to remote + hosts. (Closes: #263449) + + +++ Changes by Pierre Habouzit: + + * [debian/po/vi.po] : add the Vietnamese debconf translation by Clytie + Siddall. (Closes: #312156) + + +++ Changes by Christopher Martin: + + * Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev, + libxdmcp-dev, libxcomposite-dev, libxdamage-dev, and prune the + 07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr + is also now built and installed with kwin. + + * Tightened build dependency on dbus-qt-1-dev to force building against a + C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is + available on all arches. + + * Tighten all package relations between packages in kdebase, preventing many + instances of potentially harmful partial upgrades. In particular, ensure + that kdm is upgraded along with kdebase-bin. (Closes: #312358) + + * Fix typos in the kappfinder manpage. Thanks to A Costa. (Closes: #312767) + + * Add a patch that makes knotify aware that arts is available when arts is + manually started. This (more or less) resolves the issue wherein knotify + did not work with arts, had arts ever once been unavailable. + (Closes: #312217) + + * No longer set a random ForgingSeed in the kdmrc conffile, for this caused + each kdebase build to generate a different kdmrc, and therefore made + updates a nuissance. + + * Make kdm Suggest kdepasswd, since the later contains icons that can be + used to provide users with 'face' icons. + + * Fix formatting of the kdepasswd manpage. (Closes: #313472) + + * Add the Arabic debconf translation by Mohammed Adnene Trojette. + (Closes: #320768) + + * Fix kdm session files that contain the incorrent binary names. + (Closes: #320628) + + * Change kdm's debconf dependency into a dependency on debconf | + debconf-2.0, as this allows the installation of cdebconf. + + * Move all of konsole's README documentation into /usr/share/doc/konsole. + (Closes: #324003) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 25 Aug 2005 22:58:52 +0200 + +kdebase (4:3.4.1-1) experimental; urgency=low + + * New upstream release. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 31 May 2005 15:43:52 -0400 + +kdebase (4:3.4.3-0ubuntu6) breezy-updates; urgency=low + + * Add kubuntu_34_kdesu_sycoca_cache_path.diff fix administrator + kcontrol module bug http://bugzilla.ubuntu.com/8681 + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 2 Nov 2005 02:37:11 +0000 + +kdebase (4:3.4.3-0ubuntu5) breezy-updates; urgency=low + + * Fix kubuntu_23_hal_api.diff to include the proper configure + checks for hal 0.5 http://bugzilla.ubuntu.com/17625 + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Oct 2005 13:39:57 +0000 + +kdebase (4:3.4.3-0ubuntu4) breezy; urgency=low + + * Fix typo in kubuntu_18_default_fonts.diff to give anti-aliased + fonts in kdm + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 11 Oct 2005 22:50:44 +0100 + +kdebase (4:3.4.3-0ubuntu3) breezy; urgency=low + + * Add kubuntu_33_kubuntuify_about.diff to make about page point to + documentation + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 10 Oct 2005 16:02:47 +0100 + +kdebase (4:3.4.3-0ubuntu2) breezy; urgency=low + + * Add a build-dep on automake1.9 to clear up the failure to build. + + -- Adam Conrad <adconrad@ubuntu.com> Mon, 10 Oct 2005 14:03:47 +1000 + +kdebase (4:3.4.3-0ubuntu1) breezy; urgency=low + + * New upstream release + * Move 18_default_fonts.diff to kubuntu_18_default_fonts.diff and use DejaVu + fixes http://bugzilla.ubuntu.com/14690 + + -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 7 Oct 2005 14:23:37 +0000 + +kdebase (4:3.4.2-0ubuntu5) breezy; urgency=low + + * Add kubuntu_32_usplash_console_font.diff + make sure to set console fonts when usplash is runing + before X is started (ubuntu No 15344 , No 15102) + * Ensure kubuntu_27_aboutscreen_searchbar.diff is not + applied before upload + * Fix kdm.postinst to move kdm back to S21 + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 27 Sep 2005 12:50:34 +0100 + +kdebase (4:3.4.2-0ubuntu4) breezy; urgency=low + + * Add kubuntu_29_desktop_roundedge_icons.diff for rounded text + on desktop icons + * Compile with GCC 3.4 on hppa, m68k, arm to prevent + internal compiler error + * Add kubuntu_30_startkde_background_colour.diff to make default + background colour match default wallpaperchange background colour + * Do not install SVG icons to save space + * Install simple konqueror.rc into /usr/share/apps/konqueror, workaround + for sessions loading beastie http://bugs.kde.org/109493 + * Add kubuntu_31_kicker_crash.diff branch patch to prevent kicker crashes + * Update kubuntu_27_aboutscreen_searchbar.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 26 Sep 2005 12:40:50 +0100 + +kdebase (4:3.4.2-0ubuntu3) breezy; urgency=low + + * Do not install System.desktop or Home.desktop kdesktop icons + * Add back missing kubuntu_23_hal_api.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 15 Sep 2005 20:51:54 +0000 + +kdebase (4:3.4.2-0ubuntu2) breezy; urgency=low + + * SECURITY UPDATE: fix insecure lock file creation + * If the directory /var/lock is writeable for a user that is allowed to + invoke kcheckpass, a local user can escalate its privileges to the + root user. + * References: + http://www.kde.org/info/security/advisory-20050905-1.txt + CAN-2005-2494 + + -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 6 Sep 2005 11:51:57 +0000 + +kdebase (4:3.4.2-0ubuntu1) breezy; urgency=low + + * New upstream release + * Move 10_kdmrc_defaults.diff to kubuntu_10_kdmrc_defaults.diff + and s/Debian/Kubuntu + * Add kubuntu_27_aboutscreen_searchbar.diff + + -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 1 Sep 2005 19:18:56 +0000 + +kdebase (4:3.4.1-0ubuntu6) breezy; urgency=low + + * Add xmkmf to build-depends, as configure appears to want it. + + -- Adam Conrad <adconrad@ubuntu.com> Fri, 19 Aug 2005 21:41:55 +1000 + +kdebase (4:3.4.1-0ubuntu5) breezy; urgency=low + + * Rebuild to pick up new mesa shlibs and drop Xrender.la references. + + -- Adam Conrad <adconrad@ubuntu.com> Fri, 19 Aug 2005 14:01:12 +1000 + +kdebase (4:3.4.1-0ubuntu4) breezy; urgency=low + + * New kubuntu_23_hal_api.diff to fix problems + with HAL support + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 27 Jun 2005 16:08:59 +0000 + +kdebase (4:3.4.1-0ubuntu3) breezy; urgency=low + + * Add build-depend on x11proto-kb-dev where + XKBstr.h has been moved to + * Add build-depend on libxkbfile-dev where + XKBrules.h has been moved to + * Update kubuntu_23_hal_api.diff + * Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff + which stops KControl displaying (use System Settings instead) + * Add kubuntu_26_startkde.diff to start ivman + * Add 25_khelp_htdig.diff from Debian + + -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Jun 2005 09:15:07 +0000 + +kdebase (4:3.4.1-0ubuntu2) breezy; urgency=low + + * Rebuild to get proper libglu1c2 shlibs dependencies. + + -- Adam Conrad <adconrad@ubuntu.com> Fri, 17 Jun 2005 07:34:22 +0000 + +kdebase (4:3.4.1-0ubuntu1) breezy; urgency=low + + * Update version number following KDE 3.4.1 release + * Add kde-base conflict with kdm << 3.4.1 + * Add back ktip to meta package + + -- Jonathan Riddell <jr@jriddell.org> Wed, 1 Jun 2005 00:15:47 +0000 + +kdebase (4:3.4.1-0ubuntu0pre3) breezy; urgency=low + + * Add build-depend son libxcomposite-dev and libxdamage-dev + * Add kubuntu_24_deb_web_shortcut.diff redirecting deb: to package.ubuntu.com + + -- Jonathan Riddell <jr@jriddell.org> Thu, 26 May 2005 10:38:42 +0000 + +kdebase (4:3.4.1-0ubuntu0pre2) breezy; urgency=low + + * Add build-dep on libxau-dev, libxdmcp-dev to let KDM compile + + -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 19:23:39 +0000 + +kdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low + + * New upstream release. + * Sync with Debian + * Change /usr/bin/X11 to /usr/X11R6/bin in kdm.README.Debian and + patches/11_genkdmconf.diff renamed to kubuntu_01_genkdmconf.diff + and alter PATH in debian/rules + + -- Jonathan Riddell <jr@jriddell.org> Tue, 24 May 2005 11:34:02 +0000 + +kdebase (4:3.4.0-0pre4) alioth; urgency=low + + * New upstream release. + + * Bugs reported in the Debian BTS fixed by this release: + + - KDE can now use pmount if available. (Closes: #294258) + + - drag'n'dropping local files from Konqueror to Thunderbird works now + (file:/// is used instead of file:/ for the url). (Closes: #296255) + + - konsole now uses a proper set of default fonts, resulting in less + obvious corruption. (Closes: #289468) + + * Converted packaging to CDBS (initial version by Daniel Schepler, further + changes by Christopher Martin and Adeodato Simó). + + +++ Changes by Christopher Martin: + + * Added a patch to set reasonable default fonts, using the fontconfig + defaults, for kpersonalizer, kcontrol, kdm, and the Plastik theme. We + also use the Debian Blue artwork to provide a standard desktop + background. + + * KDM no longer shows the Custom session. When it works at all, it simply + duplicates Default's behaviour anyway. (Closes: #251602) + + * New KDM patches source /etc/profile and the user's normal shell startup + scripts. (Closes: #173802, #211953, #250645, #250765, #289143) + + * KDM once again looks for window manager session definitions in + /usr/share/apps/kdm/sessions by default. (Closes: #293645, #310155) + + * USB usermap for Logitech mice is now installed, with device permissions + set so that members of the plugdev group can make use of the Logitech + KControl module (under Peripherals/Mouse). + + * Added README.Debian files for kcontrol and kdebase-kio-plugins, explaining + how to setup Logitech mouse advanced configuration, and the media + kioslave. + + * New kdebase-doc-html package, containing doc-base registered HTML versions + of application handbooks, for users without Konqueror or KHelpCenter. + + * Fixed typos in the kate manpage. Thanks to A. Costa. (Closes: #302812) + + * KControl and KInfoCenter are now only visible in the KDE menu. Their + presence elsewhere had caused user confusion. They are both still + available through the Debian menu system. Trivial patch borrowed from + Kubuntu. (Closes: #246280) + + * Make ksmserver Recommend kpersonalizer, since it is used when + running KDE for the first time. Also patch startkde so it doesn't + fail when kpersonalizer is not present. (Closes: #309803) + + * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it + down) and my own manpage for kdesu/kdesud. (Closes: #239945) + + +++ Changes by Adeodato Simó: + + * After clearing up some issues with multiple de.po files being sent for + inclusion, include an updated German po-debconf translation sent by + Florian Ernst, and agreed upon several translators. (Closes: #291954) + + * Created XPM icons for packages having a menu file. Install them in + /usr/share/pixmaps and update the menu entries to use them. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 14 May 2005 13:00:44 -0400 + +kdebase (4:3.3.2-1) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * KDE_3_3_BRANCH update. + + * Fix typo in kdebase-bin description. (Closes: #286587) + + * Update kdeprint documentation to sync with kdelibs patches. + + * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work" + problem when upgrading to KDE 3.3, and how to deal with it. + (Closes: #266106, #267622) + + * Fix update-alternatives prerm scripts: only --remove when + the package is actually being removed, not upgraded. This + should prevent the needless resetting of the sysadmin's + preferences on package upgrade. (Closes: #247243) + + * Fix debian/copyright to refer to License rather than to Copyright + when discussing KDE's licenses. + + +++ Changes by Adeodato Simó: + + * debian/control: + - make kdebase-dev depend on kwin for the libkdecorations.so -> + libkdecorations.so.1.0.0 symlink. (Closes: #289544) + + * Included Czech po-debconf translation by Miroslav Kure. + (Closes: #289454) + + * Add manpages for keditbookmarks, konqueror, and kfmclient. + (Closes: #286373) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Jan 2005 16:11:07 +0100 + +kdebase (4:3.4.0-0ubuntu21) breezy; urgency=low + + * Remove visiblity=hidden from admin/acinclude.m4.in + + -- Jonathan Riddell <jr@jriddell.org> Sat, 21 May 2005 14:54:28 +0000 + +kdebase (4:3.4.0-0ubuntu20) breezy; urgency=low + + * CXX transition: Tighten build-deps on kdelibs4-dev and libdbus-qt-1-dev. + + -- Matthias Klose <doko@ubuntu.com> Fri, 20 May 2005 14:58:10 +0000 + +kdebase (4:3.4.0-0ubuntu19) breezy; urgency=low + + * Add kubuntu_23_hal_api.diff and change build-depends to compile + against new dbus/hal. + + -- Jonathan Riddell <jr@jriddell.org> Thu, 12 May 2005 15:29:39 +0000 + +kdebase (4:3.4.0-0ubuntu18) hoary; urgency=low + + * Add kubuntu_21_konq_tab_colour.diff make loading tab text colour visible + * Add kubuntu_22_kipper_menu.diff hide klipper from menu + + -- Jonathan Riddell <jr@jriddell.org> Wed, 6 Apr 2005 02:46:32 +0100 + +kdebase (4:3.4.0-0ubuntu17) hoary; urgency=low + + * Changed kdm start from S13 to S21 (Ubuntu: 8029) + * More Linitian cleanup + + -- Andreas Mueller <amu@ubuntu.com> Tue, 5 Apr 2005 16:00:01 +0200 + +kdebase (4:3.4.0-0ubuntu16) hoary; urgency=low + + * Add kubuntu_20_kdesu_sudo.diff to fix string on kdesu for sudo. + Fixes http://bugzilla.ubuntu.com/7327 + + -- Jonathan Riddell <jr@jriddell.org> Sat, 2 Apr 2005 17:01:37 +0100 + +kdebase (4:3.4.0-0ubuntu15) hoary; urgency=low + + * Remove link to pmount from hal/devices.d for kiomedia + + -- Jonathan Riddell <jr@jriddell.org> Fri, 1 Apr 2005 00:02:31 +0100 + +kdebase (4:3.4.0-0ubuntu14) hoary; urgency=low + + * Change Hidden to OnlyShowIn=Old in kubuntu_10_hide_kmenuedit_menu_entry.diff + Fixes https://bugzilla.ubuntu.com/8030 + + -- Jonathan Riddell <jr@jriddell.org> Wed, 30 Mar 2005 19:24:00 +0100 + +kdebase (4:3.4.0-0ubuntu13) hoary; urgency=low + + * Fix kdm login when shell is zsh. Thanks Antti S. Lankila for the hint. + 19_kdm_zsh_emulate.diff (Hoary #7620) + * Fix init script output (Hoary #7180) + + -- Chris Halls <chris.halls@credativ.co.uk> Wed, 30 Mar 2005 01:01:26 +0100 + +kdebase (4:3.4.0-0ubuntu12) hoary; urgency=low + + * Fix install command for edit-as-root.desktop + + -- Jonathan Riddell <jr@jriddell.org> Tue, 29 Mar 2005 00:16:01 +0100 + +kdebase (4:3.4.0-0ubuntu11) hoary; urgency=low + + * Move pmount and hal from depends to recommends for kdebase-kio-plugins + * Add edit-as-root.desktop Konqueror service menu + + -- Jonathan Riddell <jr@jriddell.org> Mon, 28 Mar 2005 20:45:01 +0100 + +kdebase (4:3.4.0-0ubuntu10) hoary; urgency=low + + * Add kubuntu_18_kate_initial_preference.diff to set make Kate + default for text files, not OpenOffice. + + -- Jonathan Riddell <jr@jriddell.org> Mon, 28 Mar 2005 14:51:20 +0000 + +kdebase (4:3.4.0-0ubuntu9) hoary; urgency=low + + * Move pmount and hal from recommends to depends for kdebase-kio-plugins + + -- Jonathan Riddell <jr@jriddell.org> Thu, 24 Mar 2005 05:18:00 +0000 + +kdebase (4:3.4.0-0ubuntu8) hoary; urgency=low + + * Make default background colour of kdm match wallpaper + * Add kubuntu_17_hide_desktop_trash.diff to hide desktop wastebin + * Remove dependency on ktip from kdebase + * Change Hidden to OnlyShowIn in knetattach.desktop so it isn't hidden from remote:/ + + -- Jonathan Riddell <jr@jriddell.org> Thu, 24 Mar 2005 04:12:14 +0000 + +kdebase (4:3.4.0-0ubuntu7) hoary; urgency=low + + * Make kdm depend on kubuntu-default-settings + + -- Jonathan Riddell <jr@jriddell.org> Thu, 17 Mar 2005 07:11:28 +0000 + +kdebase (4:3.4.0-0ubuntu6) hoary; urgency=low + + * Ensure patches are not applied before uploading + + -- Jonathan Riddell <jr@jriddell.org> Thu, 17 Mar 2005 03:54:25 +0000 + +kdebase (4:3.4.0-0ubuntu5) hoary; urgency=low + + * Add further patches to hide menu entries + + -- Jonathan Riddell <jr@jriddell.org> Thu, 17 Mar 2005 02:34:41 +0000 + +kdebase (4:3.4.0-0ubuntu4) hoary; urgency=low + + * Add kubuntu_07_hide_knetattach_menu_entry.diff-foo to hide knetattach menu entry. + + -- Jonathan Riddell <jr@jriddell.org> Thu, 17 Mar 2005 00:21:28 +0000 + +kdebase (4:3.4.0-0ubuntu3) hoary; urgency=low + + * Fix kdm.postinst to correctly update existing S99kdm links to S13kdm + + -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 23:43:54 +0000 + +kdebase (4:3.4.0-0ubuntu2) hoary; urgency=low + + * Fix kdm.postinst to update existing S99kdm links to S13kdm + * Fix kubuntu_03_ksplash_settings.diff to change all references to icon + * Remove depend on kde-style-lipstik while still in universe + * Add kubuntu_05_kdm_theme_config.diff to make kdm use Kubuntu theme + * Add kubuntu_06_hide_home_menu_entry.diff to hide Home from KMenu + + -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 17:26:25 +0000 + +kdebase (4:3.4.0-0ubuntu1) hoary; urgency=low + + * Add kubuntu_03_ksplash_settings.diff to use correct icon on splash screen + * Depend kdebase on kde-style-lipstik + * Do not install System.desktop or Home.desktop kdesktop icons + * Add kubuntu_04_hide_menu_entries.diff to hide kwrite menu entry + * Add link to pmount from hal/devices.d for kiomedia + + -- Jonathan Riddell <jr@jriddell.org> Wed, 16 Mar 2005 01:29:27 +0000 + +kdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low + + * Make kdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 + for gdm). + * Make kdebase-bin depend on gdb for drkonqi + * Add patch kubuntu_02_kcontrol_only_kde_menu.diff making KControl only + show in KDE's menu + + -- Jonathan Riddell <jr@jriddell.org> Fri, 11 Mar 2005 21:47:56 +0000 + +kdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low + + * Add kwin conflicts with old kdeartwork-theme-window + + -- Jonathan Riddell <jr@jriddell.org> Tue, 8 Mar 2005 22:48:59 +0000 + +kdebase (4:3.4.0-0pre1ubuntu4) hoary; urgency=low + + * Regenerate Makefiles, this time with maintainer mode turned on + + -- Chris Halls <chris.halls@credativ.co.uk> Mon, 7 Mar 2005 23:24:28 +0000 + +kdebase (4:3.4.0-0pre1ubuntu3) hoary; urgency=low + + * Revert last change and use debian/rules buildprep to update the build system + + -- Chris Halls <chris.halls@credativ.co.uk> Mon, 7 Mar 2005 22:31:12 +0000 + +kdebase (4:3.4.0-0pre1ubuntu2) hoary; urgency=low + + * Sync 99_buildprep.diff from Debian to prevent aclocal invocation + during build + + -- Chris Halls <chris.halls@credativ.co.uk> Mon, 7 Mar 2005 21:34:35 +0000 + +kdebase (4:3.4.0-0pre1ubuntu1) hoary; urgency=low + + * Sync with Debian + * Remove kubuntu_2_acimake_configure.diff, now included by Debian + + -- Jonathan Riddell <jr@jriddell.org> Sun, 6 Mar 2005 01:52:35 +0000 + +kdebase (4:3.3.2-0pre1) experimental; urgency=low + + * New upstream release. + * KDE_3_3_BRANCH update. Includes the kdebase part of the fix + for CAN-2004-1158. + * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590) + * kwin is now registered as an x-window-manager. (Closes: #249162) + * Added /usr/share/xsessions to KDM's default session path, so + .desktop files installed there are found. + (Closes: #243770, #247365, #247747, #250384) + * kdm can now be installed while building kdebase, without affecting + the generated kdmrc and other config files. + * Adjust documentation to reflect the CUPS document path used by + Debian. + * Incorporate new manpages, for kdepasswd, kappfinder, kfind, + kmenuedit, kate, kwrite, kpager, from Andre Ramos and + Clement Stenac. + (Closes: #189574, #207123, #207124, #207125, #207126, #207130) + * Incorporate new package descriptions for konqueror, kcontrol, + and kate, from Tomas Pospisek. (Closes: #280358, #280362, #280795) + * Remove build-dependency on automake1.9. + * Acknowledge old NMUs. (Closes: #178507, #261740, #244547, #247407) + (Closes: #237062, #237065, #237067) + * Take some action wrt #284844: [AS] + - rename README.linux.console to README.Linux-font, more explicit + and does not create confusion with the original file. Removed + note about this file not being the original one. + - when talking about dpkg-reconfigure fontconfig, be clear about + which one the relevant question is and what the answer has to be. + - added patches/14_konsole_README.Linux-font.diff to make the popup + that konsole displays when it can find the font specify the full + path to the README file. (Closes: #284844) + + -- Christopher Martin <chrsmrtn@freeshell.org> Sat, 18 Dec 2004 14:54:58 -0500 + +kdebase (4:3.4.0~rc1-0ubuntu0.1) hoary; urgency=low + + * Add kubuntu_2_acimake_configure.diff to fix + problem with acimake being called by rules. + * Add kubuntu_1_applications_menu_move.diff to move applications.menu + and prevent file clash with Gnome. + * New upstream release. + + -- Jonathan Riddell <jr@jriddell.org> Sun, 23 Jan 2005 04:37:53 +0100 + +kdebase (4:3.3.1-4) unstable; urgency=high + + +++ Changes by Adeodato Simó: + + * High urgency upload to fix security vulnerability in sarge. + + * Include patch to fix CAN-2004-1158, "Konqueror Window Injection + Vulnerability". (Closes: #286516) + + * Include small patch from Christoffer Sawicki to ignore /sys and /.dev and + not report them as hard disks in Konqueror. (Closes: #287424) + + * Included Dutch po-debconf translation by Luk Claes. (Closes: #283971) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 5 Jan 2005 17:11:03 +0100 + +kdebase (4:3.3.1-3) unstable; urgency=medium + + * Include patch to fix CAN-2004-1171 ("plain text password exposure"). + Closes half of #285126. + + -- Adeodato Simó <asp16@alu.ua.es> Fri, 10 Dec 2004 22:28:25 +0100 + +kdebase (4:3.3.1-2) unstable; urgency=low + + * Forgot then in ksmserver.preinst. + + -- Christopher L Cheney <ccheney@debian.org> Thu, 4 Nov 2004 18:00:00 -0600 + +kdebase (4:3.3.1-1) unstable; urgency=low + + * New upstream release. + * KDE_3_3_BRANCH update. + * ksmserver: only reset x-session-manager on install. (Closes: #247243) + * kdm: remove log files on purge. (Closes: #273542) + * Correct Danish po-debconf translations. (Closes: #273832) + + -- Christopher L Cheney <ccheney@debian.org> Thu, 4 Nov 2004 04:00:00 -0600 + +kdebase (4:3.3.0a-1) unstable; urgency=low + + * Respin orig.tar.gz. + * KDE_3_3_BRANCH update. + * Add Turkish po-debconf translations. (Closes: #248326) + * Add German po-deconf translations. (Closes: #264608) + * Correct /etc/kde3/kdm/Xsession file. (Closes: #265795) + * Correct usage of "its" in konsole description. (Closes: #268517) + * Correct Danish po-debconf translations. (Closes: #269575) + * Correct kdm name in /etc/init.d/kdm. (Closes: #272062) + + -- Christopher L Cheney <ccheney@debian.org> Sat, 25 Sep 2004 20:00:00 -0500 + +kdebase (4:3.3.0-1) unstable; urgency=high + + * New upstream release. + + -- Christopher L Cheney <ccheney@debian.org> Fri, 13 Aug 2004 20:00:00 -0500 + +kdebase (4:3.2.3-1) unstable; urgency=high + + * New upstream release. + * ksmserver Provides: x-session-manager. (Closes: #258677) + * Remove Energy Star logo png files. (Closes: #259638) + * Build-Depends: xlibs-static-pic. (Closes: #260959) + + -- Christopher L Cheney <ccheney@debian.org> Tue, 3 Aug 2004 02:00:00 -0500 + +kdebase (4:3.2.2-1) unstable; urgency=low + + * New upstream release. + * Added Build-Depends: libsensors-dev. + * Corrected kdm postinst startup code. (Closes: #195052) + * Removed Debian menu desktop files. (Closes: #198661) + * Added a README.linux.console document. (Closes: #218035) + * Remove kdm log files on purge. (Closes: #225157) + * Corrected kate/konqueror mime nametemplate support. (Closes: #235216) + * Removed "FIXME - observe" lines from kdm scripts. (Closes: #236422) + * Added Danish po-debconf translations. (Closes: #236480) + * Remove old x-session-manager alternatives. (Closes: #236515, #236795, + #237081, #240773) + * Removed kdebase and kicker menu-methods. (Closes: #236700) + * Corrected kdm-np PAM service. (Closes: #236750, #238182, #242381) + * Added kcontrol Depends: kdebase-data. (Closes: #239297) + * Updated GDM session file. (Closes: #240980) + * debian/*.menu: remove the obsolete kderemove tag. + + -- Christopher L Cheney <ccheney@debian.org> Sun, 11 Apr 2004 04:00:00 -0500 + +kdebase (4:3.2.1-1) unstable; urgency=low + + * New upstream release. + * Added Catalan po-deconf translations. (Closes: #139733) + * Added Polish po-deconf translations. (Closes: #142540) + * Added Japanese po-deconf translations. (Closes: #137940, #210431) + * Updated kate Recommends: kregexpeditor. (Closes: #227677) + * Added konqueror Depends: kdebase-kio-plugins. (Closes: #230203) + * Added kdm Provides: x-display-manager. (Closes: #231442) + * Added kdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078) + * Added kate/konqueror mime nametemplate support. (Closes: #235216) + + -- Christopher L Cheney <ccheney@debian.org> Fri, 5 Mar 2004 04:00:00 -0600 + +kdebase (4:3.2.0-0pre1v1) experimental; urgency=low + + * New upstream release. + + -- Christopher L Cheney <ccheney@debian.org> Tue, 17 Feb 2004 17:00:00 -0600 + +kdebase (4:3.1.95-1) unstable; urgency=low + + * New upstream release. + + -- Christopher L Cheney <ccheney@debian.org> Fri, 23 Jan 2004 18:00:00 -0600 + +kdebase (4:3.1.5-2) unstable; urgency=low + + * Remove Build-Depends: libsensors-dev. + + -- Christopher L Cheney <ccheney@debian.org> Thu, 29 Jan 2004 22:00:00 -0600 + +kdebase (4:3.1.5-1) unstable; urgency=low + + * New upstream release. + * Added pt_BR debconf translation. (Closes: #107023) + * Updated /etc/gdm/Sessions/KDE file. (Closes: #177144) + + -- Christopher L Cheney <ccheney@debian.org> Mon, 12 Jan 2004 19:00:00 -0600 + +kdebase (4:3.1.4-2) unstable; urgency=low + + * Added es debconf translation. (Closes: #128933) + * Added fr debconf translation. (Closes: #132615, #225899) + * Corrected konqueror gs mime tests. (Closes: #160428) + * kdesktop Recommends eject. (Closes: #223642) + * konqueror Provides info-browser. (Closes: #223913) + * Added '|| true' to db_input lines in kdm debconf support. (Closes: #224548) + * Corrected typo in kdm.config script. (Closes: #224578) + + -- Christopher L Cheney <ccheney@debian.org> Mon, 5 Jan 2004 23:00:00 -0600 + +kdebase (4:3.1.4-1) unstable; urgency=low + + * The "Why isn't KDE installable yet" release. + * New upstream release. + * Added patch to update autotools files. + * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it + causes configure checks to fail due to #line numbers being > 32767. + * Demote kdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests. + (Closes: #142489) + * Change kicker.menu-method to not display the empty_mime icon if a menu file + doesn't provide an icon. (Closes: #154065) + * Make konqueror depend on kdesktop. (Closes: #192550) + * Update pam support to use new common module fragments. (Closes: #206958) + * Update package descriptions. (Closes: #209532, #209856) + * Strip SUID root from kcheckpass since its not needed. (Closes: #212212) + * Update kdm debconf and use po-debconf. (Closes: #218731) + * Make kicker depend on kdebase-data. (Closes: #223407) + + -- Christopher L Cheney <ccheney@debian.org> Thu, 18 Dec 2003 13:30:00 -0600 + +kdebase (4:3.1.3-1) unstable; urgency=low + + * New upstream release. + + -- Christopher L Cheney <ccheney@debian.org> Wed, 30 Jul 2003 15:00:00 -0500 + +kdebase (4:3.1.2-1.1) unstable; urgency=low + + * NMU (Maintainer is aware for a while but is dumb) + - Summary: kdebase-dev depends on kdebase that is not installable + some package have build-depends on kdebase-dev so they are + buildable since at least 06 Jun 2003 + * Fix Depends: field (previous was libsensors1 and it was replaced by + libsensors-1debian1) (Closes: #196370, #200224) + * Fix FTBFS with gcc-3.3 (Closes: #200620) + - Thanks Riku Voipio <riku.voipio@iki.fi> + - use cvs files from KDE_3_1_BRANCH + + recentapps.cpp version 1.3.6.2 + + recentapps.h version 1.3.8.2 + + service_mnu.cpp version 1.50.2.4 + + browser_mnu.cpp version 1.44.2.2 + + -- Igor Genibel <igenibel@debian.org> Fri, 18 Jul 2003 10:35:34 +0200 + +kdebase (4:3.1.2-1) unstable; urgency=low + + * New upstream release. + * Remove Build-Depends on libsasl-dev. (Closes: #189949, #193866) + * Add libkregexpeditor to kate Recommends. (Closes: #183280) + * Add efax | hylafax | mgetty-fax to kdeprint Depends. (Closes: #142489) + * Add kfind to konqueror Depends. (Closes: #192859) + * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438, + #193274) + * Add log rotation for KDM logfile. (Closes: #145345, #153728) + * Add screen number to KDM Xservers file. (Closes: #182708, #184737, #187257) + * Moved xfonts-konsole fonts to /usr/X11R6/lib/X11/fonts/misc/ + (Closes: #184548) + + -- Christopher L Cheney <ccheney@debian.org> Wed, 21 May 2003 08:00:00 -0500 + +kdebase (4:3.1.1-1) unstable; urgency=low + + * New upstream release. (Closes: #180816, #181309) + * Corrected kdm-update-menu.sh kdm.options path. (Closes: #180355) + * Added xbase-clients depend to kdm. (Closes: #180536) + * Added xutils depend to xfonts-konsole. (Closes: #180695) + * Improved xfonts-konsole description. (Closes: #180696) + * Remove upgrade from alternatives removal prerm script. (Closes: #180927) + * Change Xservers to launch /usr/X11R6/bin/X. (Closes: #182037) + * Add entries for kdm reserve xserver feature. (Closes: #182708) + * Add kcontrol depends to konqueror (Closes: #182724) + * Change konqueror menu entry to allow execution. (Closes: #183225) + * Make konqueror provide www-browser. (Closes: #183391) + + -- Christopher L Cheney <ccheney@debian.org> Tue, 11 Mar 2003 22:00:00 -0600 + +kdebase (4:3.1.0-2) unstable; urgency=low + + * Add 'chmod +x configure' to rules. + + -- Christopher L Cheney <ccheney@debian.org> Sat, 8 Feb 2003 02:00:00 -0600 + +kdebase (4:3.1.0-1) unstable; urgency=low + + * New upstream release. + * Redo debian dir. + + -- Christopher L Cheney <ccheney@debian.org> Sat, 01 Feb 2003 23:00:00 -0600 + +kdebase (4:2.2.2-14.7) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Updated patch from KDE advisory 20030916 + + -- Matt Zimmerman <mdz@debian.org> Tue, 16 Sep 2003 15:18:59 -0400 + +kdebase (4:2.2.2-14.6) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Apply updated patch from KDE advisory 20030915 + - Fixes CAN-2003-0690 (setcred()) + - Fixed CAN-2003-0692 (session cookie issue) + + -- Matt Zimmerman <mdz@debian.org> Mon, 8 Sep 2003 19:56:40 -0400 + +kdebase (4:2.2.2-14.5) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Apply patch from KDE advisory 20030908 to fix local root vulnerability in + PAM authentication in KDM + + -- Matt Zimmerman <mdz@debian.org> Sun, 31 Aug 2003 04:39:47 -0400 + +kdebase (4:2.2.2-14.4) stable-security; urgency=medium + + * Non-maintainer upload by the Security Team + * Applied upstream patch from Dirk Mueller (uninitialized variable use) + to fix problems with klipper and pasted urls (klipper/urlgrabber.cpp, + Bug#178407, thanks to Niccolo Rigacci) + + -- Martin Schulze <joey@infodrom.org> Sat, 12 Apr 2003 09:48:40 +0200 + +kdebase (4:2.2.2-14.3) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Applied upstream patch so ghostscript won't execute arbitrary commands + hidden inside of postscript files. + + -- Martin Schulze <joey@infodrom.org> Thu, 10 Apr 2003 11:44:04 +0200 + +kdebase (4:2.2.2-14.2) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Added special detection routine for big/little endianess on MIPS since + the line "byteorder : {big|little} endian" from /proc/cpuinfo was + removed as of Linux 2.4.20, resulting in the mipsel buildd being + unable to build this package. + + -- Martin Schulze <joey@infodrom.org> Thu, 9 Jan 2003 09:38:33 +0100 + +kdebase (4:2.2.2-14.1) stable-security; urgency=high + + * Non-maintainer upload by the Security Team + * Applied upstream patches to fix several potential vulnerabilities. + http://www.kde.org/info/security/advisory-20021220-1.txt + + -- Martin Schulze <joey@infodrom.org> Sun, 5 Jan 2003 21:36:47 +0100 + +kdebase (4:2.2.2-14) unstable; urgency=high + + * New maintainer. + + -- Christopher L Cheney <ccheney@debian.org> Sun, 3 Mar 2002 01:30:00 -0600 + +kdebase (4:2.2.2-13) unstable; urgency=low + + * Adopting orphaned package. Thanks Ivan for all your great work on KDE over + the years; you'll be sorely missed. (closes: #127706) + * Relink with libpng2. (closes: #128275) + * debian/rules, debian/konsole.dirs: + - Make symlinks in the X fonts directory to Konsole fonts in + /usr/share/fonts in the install target. (closes: #127871) + * debian/kdmrc: + - Disallow remote users from shutting down the machine. (Yeah, yeah, I + know - dodgy grammar). (closes: #127616) + * debian/control: + - Depend on kdebase | x-s-m | x-w-m, instead of just the latter two, so + that KDE gets installed in preference to, say, GNOME. (closes: #128208) + - Shuffle Build-Deps back to libpng2. + * kpersonalizer/keyecandypage.cpp: + - Stop anti-aliasing from being selected by default when the level of cool + stuff selected is high enough. + + -- Daniel Stone <daniel@sfarc.net> Fri, 4 Jan 2002 09:14:11 -0500 + +kdebase (4:2.2.2-12) unstable; urgency=low + + * Yet another overwrite. (Closes: #126699) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 28 Dec 2001 00:15:00 -0700 + +kdebase (4:2.2.2-11) unstable; urgency=low + + * Crap. fix -audiolibs again. + * Fix spelling error (Closes: #124779) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Dec 2001 22:00:00 -0700 + +kdebase (4:2.2.2-10) unstable; urgency=low + + * Move the audio kcm modules over to kdebase-libs since they a) don't depend + on audio libs and b) are required for sound to automatically start. + (Closes: #124144) + * More upstream konsole fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 16 Dec 2001 00:30:00 -0700 + +kdebase (4:2.2.2-9) unstable; urgency=low + + * Fix klipperrc (Closes: #123904) + * Add lynx/opera/etc to klipperrc + * Add libfam-dev to Build-Depends as well as other packages which we + depend on but have relied on other depended upon packages to provide. + * libkonq_sound.* needs to be in kdebase-audiolibs. We don't need + to require libarts to be installed in order to use konq. + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 15 Dec 2001 00:02:00 -0700 + +kdebase (4:2.2.2-8) unstable; urgency=low + + * Sync with upstream + * Fix Xsetup (Closes: #123115) + * Fix file location (Closes: #122621) + * Move keditbookmarks stuff into kdebase-libs + * Let's attempt to import mozilla bookmarks along with netscape automatically + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 09 Dec 2001 14:07:00 -0700 + +kdebase (4:2.2.2-7) unstable; urgency=low + + * Sync with upstream + * Add missing dependency for kdebase-libs to kdebase + * Move Sound .desktop files to kdebase-audiolibs + * Fix file location... + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 05 Dec 2001 16:59:00 -0700 + +kdebase (4:2.2.2-6) unstable; urgency=low + + * Move libkcm_launch.so to where it belongs (Closes: #122136) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 02 Dec 2001 15:49:00 -0700 + +kdebase (4:2.2.2-5) unstable; urgency=low + + * Crap. Fix build-depends since we now need the latest kdelibs package + I uploaded first. (Closes: #122066) + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 01 Dec 2001 22:29:00 -0700 + +kdebase (4:2.2.2-4) unstable; urgency=low + + * Sync with upstream + * Build-Depends cleanup + * Depends/Suggests/etc... cleanup for freeze + * Build cleanup + * Build with xinerama support for i386 + * Another update for Nedit.ad to work with newer Nedit + * Cleanup kdmrc for release..default to security + * Update documentation for freeze + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Nov 2001 02:30:00 -0700 + +kdebase (4:2.2.2-3) unstable; urgency=low + + * Update Brazilian Portuguese debconf entries (Closes: #120841) + * Remove kdmrc debconf note + * Add in replaces to fix those people using testing who don't know + how to use --force-overwrite or don't know how to let dpkg fix + things on the second go around. What a waste of disk space. + You know...people who don't know how to use dpkg or know how + releases are done shouldn't be allowed to manipulate severities + on bug reports. (Closes: #121163, #121165) + * Fix konsole (Closes: #120840, #120984, #121159) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Nov 2001 14:47:00 -0700 + +kdebase (4:2.2.2-2) unstable; urgency=low + + * Update deps to allow for temp -crypto packages + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 22:54:00 -0700 + +kdebase (4:2.2.2-1) unstable; urgency=low + + * new upstream version + * Add in suggests for libpam-krb/heimdel to kdm so we can get rid of the + kdm-krb package + * Update Nedit.ad (Closes: #117881) + * Apply kdm cleanup patch by Branden (Closes: #118217) + * Fix mime checks (Closes: #117747) + * Fix kate syntax highlights (Closes: #113773) + * Add kate undocumented manpage + * Run lilo query for kdm with -w + * Fix konsole crashes (Closes: #119480) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 21 Nov 2001 16:18:00 -0700 + +kdebase (4:2.2.1.0-7) unstable; urgency=low + + * Update build-deps for lesstif-dev since certain recent versions do + not contain files we need to build + * Sync with upstream + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 28 Oct 2001 11:37:00 -0700 + +kdebase (4:2.2.1.0-6) unstable; urgency=low + + * Sync with upstream + * Should fix Home/End keys (Closes: #117149, #100878, #107071, #114312) + * Fixes default.Schema (Closes: #107450) + * Transparant forgetfullness should also be fixed (Closes: #110773) + * Fix rearrange issues (Closes: #112113) + * Pause option fixed (Closes: #95928) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 26 Oct 2001 11:20:00 -0700 + +kdebase (4:2.2.1.0-5) unstable; urgency=low + + * Sync with upstream + * build with newer binutils + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 24 Oct 2001 10:11:00 -0700 + +kdebase (4:2.2.1.0-4) unstable; urgency=low + + * more upstream fixes + * Get rid of automake hacks + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 19 Oct 2001 12:46:00 -0700 + +kdebase (4:2.2.1.0-3) unstable; urgency=low + + * More konsole/transparancy fixes + * build against newer kdelibs with fixed shlibs. this'll fix several problems + with users running incompatable versions. + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 15 Oct 2001 00:30:00 -0700 + +kdebase (4:2.2.1.0-2) unstable; urgency=low + + * hopefully fix kicker/aa problems + * Fix Xpdf.ad (Closes: #115293) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 11 Oct 2001 13:26:00 -0700 + +kdebase (4:2.2.1.0-1) unstable; urgency=low + + * remove auto* bits from configure so it doesn't try to run them after + configure runs and thus re-introducing the whole automake problem with 1.5 + * Sync with upstream..new binaries so new source version...ack + * Update standards version + * Take out the extra space in the !s390 requirement + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 08 Oct 2001 20:54:00 -0700 + +kdebase (4:2.2.1-6) unstable; urgency=low + + * Fix configure + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 05 Oct 2001 14:21:00 -0700 + +kdebase (4:2.2.1-5) unstable; urgency=low + + * build with automake 1.5..well a way around it at least for now + * undocumented man page (Closes: #114144) + * Sync with upstream + * don't build-dep on xserver for s390 (Closes: #114237) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 02 Oct 2001 00:01:00 -0700 + +kdebase (4:2.2.1-4) unstable; urgency=low + + * More upstream fixes + * don't set background in startkde script by default. + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 27 Sep 2001 12:13:00 -0700 + +kdebase (4:2.2.1-3) unstable; urgency=low + + * Build-Conflicts for nas-lib so we can build properly + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 24 Sep 2001 19:28:00 -0700 + +kdebase (4:2.2.1-2) unstable; urgency=low + + * fix kdm preinst (Closes: #112900) + * fix overwrite (Closes: #112903) + * A couple kdm fixes and on keditbookmarks fix from upstream + * Use usbutils's usb.ids if it exists (Closes: #112879) + * konsole save fixes (Closes: #112982, 112943) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 23 Sep 2001 18:05:00 -0700 + +kdebase (4:2.2.1-1) unstable; urgency=low + + * New upstream version 2.2.1 + * Fix init script (Closes: #110474) + * Fix --type (Closes: #109704) + * Fix prerm (Closes: #111223) + * Fixes preinst (Closes: #111584) + * url paste/del behaviour fixed (Closes: #98121) + * item list selection works (Closes: #102879) + * GL screensaver fixes (Closes: #109270) + * Fix --type foo (Closes: #109704) + * Fix transparency issues (Closes: #84062) + * File view fix (Closes: #94641) + * kde logo rotation fix (Closes: #95841) + * desktop link url added + * kxmlrpcd not started by default (Closes: #110381) + * ppc build hack/fix for linking to -lgcc + * Fix audiocd.desktop (Closes: #111713) + * Don't use objprelink + * Don't merge resources (Closes: #112198) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 07 Sep 2001 00:01:00 -0700 + +kdebase (4:2.2.0.20010822-1) unstable; urgency=low + + * Apply GL patch for Bug #109270 + * Font/Schema/Session Management fixes for konsole + * Remove gvim.desktop and gvim.png files so there is no confliction with + new vim package. + * sync with upstream + * Fix kdm not allowing typing after the first boot + * kdm now uses new x-display-manager bits + * Fix typos and update script bits from Branden + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Aug 2001 00:01:00 -0700 + +kdebase (4:2.2.0-final-3) unstable; urgency=low + + * Fix Typo (Closes: #109115) + * Fix GL bits (Closes: #109136) + * Fix prerm - Thanks Branden (Closes: #109142) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 19 Aug 2001 00:01:00 -0700 + +kdebase (4:2.2.0-final-2) unstable; urgency=low + + * Re-Add the *proper* Xsession script that will use the one provided + by Debian's X rather than the one provided by kdm which is broken. + The one provided by Debian works better anyways. (Closes: #108736) + * Fix klipperrc (Closes: #108856) + * Add a debconf note to kdm about SessionTypes being auto-generated. This + is now noted in 3 locations. + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Aug 2001 16:53:00 -0700 + +kdebase (4:2.2.0-final-1) unstable; urgency=low + + * New upstream version + * Fix debconf template (Closes: #107021) + * fix mime (Closes: #107145) + * Fix kdebase compile issues (Closes: #107010, #104045) + * Provide x-display-manager as well as all the new bells and whistles + that Branden Robinson hacked together to allow *dm's to play nice + * Move around EBS's for bug: stuff (Closes: #107832) + * Hack to work around hppa problems. (Closes: #108274) + * If ~/.resources exists, load it (Closes: #108394) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 12 Aug 2001 01:52:00 -0700 + +kdebase (4:2.2.0-0.3beta1-1) unstable; urgency=low + + * Sync with upstream + * Fix http connection problems (Closes: 106909) + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Jul 2001 14:08:00 -0700 + +kdebase (4:2.2.0-0.2beta1-2) unstable; urgency=low + + * konsole bits are fixed (Closes: #100878) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 02:14:00 -0700 + +kdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low + + * add GL_LDFLAGS="-lpthread" to build process for building with X4.1 + * Fix htdig pathing for htdig.gif (Closes: #103977) + * Update Build-Depends and Depends + * Fix pdf viewing problem (Closes: #88006) + * Fix reference to woody's version in userguide (Closes: #105301) + * kdm Brazilian debconf translations (Closes: #105374) + * Fix kde-update-menu script so that it can be run as a normal user + (Closes: #105786) + * sync with upstream + * gcc3 fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:40:00 -0700 + +kdebase (4:2.2.0-0.1beta1-2) unstable; urgency=low + + * Sync with upstream + * Update README (Closes: #103680) + * Build with -mieee for Alpha + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Jul 2001 01:13:00 -0700 + +kdebase (4:2.2.0-0.1beta1-1) unstable; urgency=low + + * Sync with upstream + * Spanish template (Closes: #103065, #103232) + * Fix kde-update-menu (Closes: #103228) + * don't let debhelper compress .bz2 files + * Auto-build for alpha + * Fix overwrite (Closes: #103390) + * Fix "same file" problem (Closes: #103528) + * Add missing Build-Depends (Closes: #103535) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 04 Jul 2001 01:45:00 -0700 + +kdebase (4:2.2.0-0beta1-3) unstable; urgency=low + + * Fix konsole mappings maybe? + * Fix overwrites (Closes: #102852, #102856) + * Fixes pam file (Closes: #102854) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 22:00:00 -0700 + +kdebase (4:2.2.0-0beta1-2) unstable; urgency=low + + * Fix kdm preinst + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 09:51:00 -0700 + +kdebase (4:2.2.0-0beta1-1) unstable; urgency=low + + * Update path info in kdm files...these were in the comments so + it wasn't a big deal + * Add a comment to default kdmrc about SessionType generation + * Re-hash kdm README + * KDE 2.2 beta1 + * Sync with upstream + * Fix typo in Xsetup + * Fix dup dependencies (Closes: #99690) + * Fix other replaces and whatnot (Closes: #101187) + * Add filterproxy,freenet user to kdmrc (Closes: #96707, #98746) + * Upstream reports these bugs fixed (Closes: #77151) + * Adding in a note about kwrited (Closes: #97245) + * Add w3m to klipperrc + * Re-adding debian xpm files + * Fix gdm script (Closes: #92712) + * Update konq mime (Closes: #97694) + * Fix menu-method (Closes: #98816) + * Change to -cvs* versioning for entrance into experimental + * Merge all changelogs from -alpha1 versions + * This is a post alpha1 snapshot taken from the HEAD cvs branch. The + date listed in the version number states when the initial pull was made + however updates may and most likely will have taken place since that + date. Look at it as a >= cvs{date} + * Generate SessionTypes line in kdmrc during kdm postinst. + * Change KDE logo's in konq's about:konqueror to Debian powered-by logo with + link to debian.org instead of kde.org + * Remove old menu debian xpm files and use existing debian png mimetype + graphic as it still looks good and is already there. + * Downgrade x-session-manager alternative priority to conform to policy + even tho there is none for x-session-manager yet. Using x-window-manager + as the guide + * Add in a suggests for x-terminal-emulator to libkonq3 + * Change call to konsole in libkonq3 to use x-terminal-emulator instead + * Add in missing mimetypes + * Don't run mkfontdir during package build. make sure there is not fonts.dir + files created + * Move to debhelper 3..or rather actually depend on v3 which is what + we were using. + * Fix description of kate...oops..thanks Oswald. :) + * More menu clean...full pathing + * ton of kdm updates...basically syncing conffiles with those from + the xdm from 4.0.3 + * More build-deps: + libogg-dev, libvorbis-dev (For auidocd:/ support) + * Provide man link from kdm to chooser + * More build cleanup..take more of the automation out to make sure things + are constant + * Remove custom startkde + * Revert old overrides so we can start from scratch + * Add in new python-base dependency + * New packages: kate, kdebase-audiolibs (so that those without sound do + not have to install sound libs. Your welcome.) + * Lots of files moving around...out of kdebase-libs into the new + kdebase-audiolibs and to konqueror. This should drastically reduce + the size of kdebase-libs which is required by alot of non-kdebase packages + in order to provide things like smtp, bug reporting, etc... + * And let's list the bugs fixed... + ctrl-u problems with location bar fixed (Closes: #81425) + image transparency fixed for konsole on startup (Closes: #84062) + fixes kwin's conflicting key accelerators (Closes: #86370) + fixes rendering error for www.bluesnews.com (Closes: #79800) + fixes button problems for katalog.ub.uni-heidelberg.de (Closes: #88934) + now provides the audiocd ioslave bits which allow for ripping audio + tracks using konqueror..ie drag and drop..I'm not saying it works... + just saying the code is there now...(Closes: #91829) + Oh...and did I say...IMP works now via konqueror!@# YEA!@# I personally + can now drop netscape. + Fix description (Closes: #95939) + Fixes anchor problem (Closes: #88605) + New HD Templates (Closes: #94004) + lots and lots and lots of little things of course have been fixed + lots and lots and lots of little things of course have been added + * Move khelpcenter's menu entry into Top level Help (Closes: #93702) + * New man pages for: konqueror + * More debconf cleanup + * Adding in suggests for xearth + * Add in Dependency for x-window-manager | x-session-manager to kdm + * Add icons to debian sub menus + * kdm auto-generation of session list + * Merging Debian and KDE menus a bit + * Add lynx and links to default klipperc + * Fixed communicator entry in klipperrc so that it will actually launch + communicator + * More x-terminal-emulator fixes (Closes: #99982) + * Fix render issues with inline scripts (Closes: #99402) + * Fix sed issues (Closes: #101280, #101333) + * Trash problem no longer exists (Closes: #101129) + * Now properly understands environment variables either directly or + indirectly. By release it will have a GUI option for this or will have + information in the FAQ on konqueror.org that will tell how to do it. + (Closes: #87178) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700 + +kdebase (4:2.1.1-5) unstable; urgency=low + + * Overhaul menu-method bits. + kderemove="y" in a menu entry will cause that menu item to not show + up in the KDE Debian submenu. (Closes: #93260) + * Update build-depends to recognize real | virtual + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 17:21:00 -0700 + +kdebase (4:2.1.1-4) unstable; urgency=low + + * Fix a couple debconf problems + * Couple more lintain errors down the tubes + * Some more upstream fixes + * Remove AA items as they now go in task-kde-aa + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Apr 2001 04:11:00 -0700 + +kdebase (4:2.1.1-3) unstable; urgency=low + + * Fix kdmrc file (Closes: #92415) + * Update XftConfig example + * Fix kfmclient and kicker crashes (Closes: #89146, #88647) + * More upstream fixes + Fix for Proxy Authentication + * Apply Dutch debconf konq translations (Closes: #92533) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 03 Apr 2001 10:26:00 -0700 + +kdebase (4:2.1.1-2) unstable; urgency=low + + * Move startkde script into /etc/kde2 so that it will be a conffile and + link it back to /usr/bin/kde2. (Closes: #91787) + * Build on older libc + * Adding in recommends for klisa + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Mar 2001 10:59:00 -0700 + +kdebase (4:2.1.1-1) unstable; urgency=low + + * New upstream version + * Remove manpage alternative for x-terminal-emulator (Closes: #91357) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Mar 2001 20:49:00 -0700 + +kdebase (4:2.1.0.1-5) unstable; urgency=low + + * One more shot the AA settings fix + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Mar 2001 20:49:00 -0700 + +kdebase (4:2.1.0.1-4) unstable; urgency=low + + * pam_env fixes for kdm as well as a ton of other updates to kdm + * Fixing a problem with the default AA settings. It looks like I "fixed" + the wrong bit when I first fixed this. (Closes: #89741) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Mar 2001 10:41:00 -0700 + +kdebase (4:2.1.0.1-3) unstable; urgency=low + + * Adding in debconf note for systems that have a /.kde directory + * Adding debconf dependency to kdm + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 13 Mar 2001 18:20:00 -0700 + +kdebase (4:2.1.0.1-2) unstable; urgency=low + + * Fix kdm init script. actually stop when we tell you to stop (Closes: #89235) + * More documentation added to the QT AA Font Howto + * Fix for K Menu restarts and other funky behaviour + * XftConfig example included + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 05:23:00 -0700 + +kdebase (4:2.1.0.1-1) unstable; urgency=low + + * More upstream fixes + * Adding a QT AA Font HOWTO written by Lars Knoll <lars@trolltech.com> with + his permission...it's been slightly modified with Debian specific infoz. + * Major cleanup to debian.diff + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 10 Mar 2001 00:17:00 -0700 + +kdebase (4:2.1.0-4) unstable; urgency=low + + * More upstream fixes + konqueror - minimum size for history is 1 + konqueror - check config key for minimum size of 1 + KSysGuardApplet - use correct catalog for translations + KSysGuardApplet - save settings on exit + * Adding in "Replaces" for faulty kde-i18n package + * Removing link to non-existant man page for x-session-manager + * Adding xserver to build-depends as the configure scripts look for it to + determine pathing and whatnot + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 07 Mar 2001 02:32:00 -0700 + +kdebase (4:2.1.0-3) unstable; urgency=low + + * Grrr...let's try this konsole thing again + * Add in Mozilla plugin paths for nspluginscan + * More upstream fixes + * FIXED - manual URL input. Users may have to restart KDE. (Closes: #88331) + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 03 Mar 2001 00:01:00 -0700 + +kdebase (4:2.1.0-2) unstable; urgency=low + + * Re-Enable AA support in konsole as it's brokt if you enable AA either + way...but if AA support is enabled at least you can change the font. + * url entry problems should also be fixed now + * FIXED - anyone was allowed to shutdown despite RootOnly mode + * More cleanup on konsole default keytabs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 03 Mar 2001 00:01:00 -0700 + +kdebase (4:2.1.0-1) unstable; urgency=low + + * Changing version number so that I can re-upload the source. This is a + CVS sync with the 2.1 branch which will eventually become 2.1.1 + The main purpose for doing this is to allow an easier way for handling + upstream fixes as the old source had the head tag and not the branch tag. + * Fix kmenuedit...not sure how kmenuedit.so got moved to -dev (Closes: #87817) + * Include utf8.sh as konsole-utf8 (Closes: #87724) + * Remove hacks for XFT bug + * Turn off XFT for konsole as konsole doesn't handle AA very well right now + * Turn off AA support by default...grrrrr..this fixes alot of crashes and + other issues. (Closes: #84472) + * Adding in Recommends for xfonts-scalable and a Suggests for xfs-xtt. If + AA is turned on and there are no type1 fonts it seems to be very unhappy. + * Includes fix for QT 2.3.0 so that the url entry problems go away + * Adding in Suggests for fttools (creates the fonts.dir for truetype fonts + * More information added to kdebase's README.debian on truetype font + setup + * Make the XFree 3.x.x keytab for konsole the default one to fit policy + * Fix for stylesheet application (Closes: #87188) + * The url entry bug is believed to be a bug in QT and a report has gone + on to trolltech. The KDE developer who made this report stated that + a hack patch might be applied to get around it for now. I'm choosing not + to go that route. If the bug is in QT, that's where it needs to be fixed. + I don't want to have to update this package and QT both to fix a single + problem and I definatly hate bandaides. + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 01 Mar 2001 00:15:00 -0700 + +kdebase (4:2.1-final-1) unstable; urgency=low + + * New upstream version + * Fix kdm init.d script + * Upping standards version + * Fix for "chooser not running from kdm" (Closes: #76586) + * Fix graphics display (Closes: #85166) + * Fix bg clear issue (Closes: #77649) + * Fix kdm and expiring passwords + * Fix for konq crash on startup and other crashes (Closes: 84472, #77151, #80102) + * Moving task-kde* packages out of kdebase source + * Fixes for khelpcenter hangs (Closes: #81683) + * konq provides ftp-client as well + * Update /usr/bin/kde2 script + * Compile ldap kioslave + * Updated kdm init.d script + * Fix these rendering issues (Closes: #87183) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 02:31:00 -0700 + +kdebase (4:2.1-beta2-0128-1) unstable; urgency=low + + * More work on nspluginscan to avoid problems with faulty plugins + * Several small bug fixes from upstream + * Adding xutils to task-kde-devel package + * Fixing conflict with kfind (Closes: #83709) + * Fixing default bs for konsole for those not using "linux" or "vt100" + (Closes: #83705) + * Adding notation to konqueror about page about kdelibs3-crypto + * Applying German debconf template (Closes: #83871) + * Should also handle upgrade cleanup better. This is across the board but + affects base more than any other package. (Closes: #83543) + * Fixes problem with symbols in konsole (Closes: #83987) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 28 Jan 2001 01:30:00 -0700 + +kdebase (4:2.1-beta2-3) unstable; urgency=low + + * Don't crash when trying to load/read faulty plugins (Closes: #82983) + * Moving kdesu to kdebase-libs so that we can use it without needing + kdebase installed + * Adding autoconf and gettext to build-deps + * Several small bug fixes from upstream + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 25 Jan 2001 02:10:00 -0700 + +kdebase (4:2.1-beta2-2) unstable; urgency=low + + * Updating menu entries (Closes: #83216) + * Fixes form content memory in konq (Closes: #77317) + * Fixes problem with version numbers not showing + * Adding Build-Depends for xutils as it seems kdm needs imake + * Applied patch for konq template (Closes: #83355) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Jan 2001 12:36:00 -0700 + +kdebase (4:2.1-beta2-1) unstable; urgency=low + + * New upstream beta + * No Response header fixing (Closes: #77398) + * Fixes toolbar settings (Closes: #80487) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 22 Jan 2001 00:10:00 -0700 + +kdebase (4:2.1-20010118-1) unstable; urgency=low + + * More upstream fixes + Fix JS crashes with onmouseover + Updated print dialog + * Updated sections + * Change Recommend to Suggests (Closes: #82764) + * Another fix to the gtk non-overwrite bits + * clean source tree + * Fixing documentation inclusion and Changelog inclusion + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 Jan 2001 12:45:00 -0700 + +kdebase (4:2.1-20010115-1) unstable; urgency=low + + * More upstream fixes + * ask where the mozilla bookmarks are (Closes: #81710) + * tip that was annoying to some seems to be gone (Closes: #82253) + * Adding in kscreensaver pam file + * Updating kdmrc to match current features and all + * Add a link in /etc/X11/kdm to kdmrc (Closes: #82643) + * Updated kde2 start script that fixes overwriting of gtk confs + * This version fixes smb problems...you just need to make sure + you have smbclient installed. Added that as a Recommend (Closes: #82612) + * (Closes: #76838, #77093) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 Jan 2001 01:00:00 -0700 + +kdebase (4:2.1-20010109-1) unstable; urgency=low + + * More upstream fixes + * Fixing some more task- related issues + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 09 Jan 2001 10:05:00 -0700 + +kdebase (4:2.1-20010106-1) unstable; urgency=low + + * More upstream fixes + * Moving task- conflicts/replaces into kdebase so as to keep dist-upgrade + from being unhappy. (Closes: #81365) + * Adding in a debconf note about SSL support + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 06 Jan 2001 20:54:00 -0700 + +kdebase (4:2.1-20010101-2) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 04 Jan 2001 03:30:00 -0700 + +kdebase (4:2.1-20010101-1) unstable; urgency=low + + * More upstream fixes + * Fixing development task + * Should also fix klipper crashes (Closes: 80330) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 01 Jan 2001 05:15:00 -0700 + +kdebase (4:2.1-20001218-2) unstable; urgency=low + + * More upstream fixes + * Adding in a undocumented manpage for /usr/bin/kde2 + * Fixing problem with Netscape.ad again + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 20 Dec 2000 15:15:00 -0700 + +kdebase (4:2.1-20001218-1) unstable; urgency=low + + * More upstream fixes + * Fix for GDM Session (Closes: #79987) + * Update to kdm man page and README + * Adding /usr/bin/kde2 as a x-session-manager + * Adding new menu hints (Closes: #80022, #80020) + * Fixing menu-method to handle new hints + * Updating menu files for konqueror + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Dec 2000 11:16:00 -0700 + +kdebase (4:2.1-20001216-1) unstable; urgency=low + + * More upstream fixes + * Removing x-window-alternative as it's causing more problems than + solutions + * Adding in better notation about htdig (Closes: #79710) + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 16 Dec 2000 23:13:00 -0700 + +kdebase (4:2.1-20001213-1) unstable; urgency=low + + * New upstream beta + * Fixing alternative priority for konsole + * Adding in a session for gdm (Closes: #74678) + * new x4 port of xdm -> kdm (Closes: #79196, #79509) + * Fix whatis typo (Closes: #78178) + * Fix segfaults (Closes: #78903) + * Adding in a Recommend for kview to konqueror (Closes: #79201) + * Changing x-window-manager alternative from kde2 to kwin + * KDM init.d script cleanup (Closes: #79320) + * Fixed default kdmrc script to show new options + * Adding in a kwm script for non-session launches + * Adding new users to NoUsers (Closes: #79617) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 13 Dec 2000 14:41:00 -0700 + +kdebase (4:2.0-final-5) unstable; urgency=low + + * More upstream fixes + * Fixing suid bits and ownerships - security fixes + * More suggests added + * Again removing update-alternatives --auto (Closes: #75623) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Nov 2000 14:10:00 -0700 + +kdebase (4:2.0-final-4.3) unstable; urgency=low + + * New i18n patch for krdb kcontrol module + * More dependency work + * Minor tweak to Netscape.ad to fix font problem in messanger + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 12 Nov 2000 20:00:00 -0700 + +kdebase (4:2.0-final-4.2) unstable; urgency=low + + * More upstream fixes + * Setting konsole as a x-terminal-emulator alternative + * Adding in provides for www-browser and x-terminal-emulator + * Removing dpkg-alternatives x-windows-manager auto setting + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 10 Nov 2000 13:30:00 -0700 + +kdebase (4:2.0-final-4.1) unstable; urgency=low + + * Adding in menu hints + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 09 Nov 2000 22:45:00 -0700 + +kdebase (4:2.0-final-4) unstable; urgency=low + + * Minor upstream documentation updates + * more kdebase-libs work + now properly handles pop3 and other services correctly + now allows for email configuration without kdebase installed + * more dependency work with kdm (Closes: #76565) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Nov 2000 17:30:00 -0700 + +kdebase (4:2.0-final-3.1) unstable; urgency=low + + * applying i18n patch (Closes: #75831) + * more kdmrc default setting updates + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 05 Nov 2000 23:00:00 -0700 + +kdebase (4:2.0-final-3) unstable; urgency=low + + * more upstream fixes + * more kdmrc default setting updates + * build against new xlibs and updating depends + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 01:00:00 -0700 + +kdebase (4:2.0-final-2) unstable; urgency=low + + * more upstream fixes + * klipper should be happy again + * more konqueror debian settings (ie..jdk default path) + * Minor kde2 script fixes + * Fixing task-kde-devel depends + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Nov 2000 18:00:00 -0700 + +kdebase (4:2.0-final-0) unstable; urgency=low + + * KDE 2.0 + * Updating nsplugin search paths + * Adding in suggest for java-virtual-machine + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Oct 2000 00:00:00 -0700 + +kdebase (4:2.0-20001016-0) unstable; urgency=low + + * more upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Oct 2000 15:00:00 -0700 + +kdebase (4:2.0-20001015-0) unstable; urgency=low + + * More upstream fixes + * More konqueror fixes for seperate package + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 15 Oct 2000 20:05:00 -0700 + +kdebase (4:2.0-20001013-0) unstable; urgency=low + + * kdmdesktop fixes from upstream + * more i18n work + * applying i18n patche + * more fixes for konqueror + * Creating a kdebase-libs package + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 07:13:00 -0700 + +kdebase (4:2.0-20001011-0) unstable; urgency=low + + * Lintian error cleanup + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 12 Oct 2000 05:30:00 -0700 + +kdebase (4:2.0-20001010-0) unstable; urgency=low + + * more upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 10 Oct 2000 17:00:00 -0700 + +kdebase (4:2.0-20001009-0) unstable; urgency=low + + * KDE 2.0 RC2 + * more upstream fixes + * minor kdmdekstop fix + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 09 Oct 2000 08:00:00 -0700 + +kdebase (4:2.0-20001008-0) unstable; urgency=low + + * Breaking out konqueror, konsole, libkonq3 (and -dev) into seperate packages + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 08:30:00 -0700 + +kdebase (4:2.0-20001006-1) unstable; urgency=low + + * More upstream fixes + * Applying kdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:30:00 -0700 + +kdebase (4:2.0-20001006-0) unstable; urgency=low + + * More upstream fixes + * Breaking out crypto modules into a seperate package + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 06 Oct 2000 01:30:00 -0700 + +kdebase (4:2.0-20001004-0) unstable; urgency=low + + * More upstream fixes + * No longer depend on versioned kdelibs + * Fixing up kdm's postinst to better handle kdmrc + * More spice for kdm + * Fixes the following: (Closes: #73057, #73015, #73002, #72921, #72989, #72919, #72638) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Oct 2000 01:00:00 -0700 + +kdebase (4:2.0-20001002-0) unstable; urgency=low + + * KDE 2.0 RC1 + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Oct 2000 01:00:00 -0700 + +kdebase (4:2.0-20000927-2) unstable; urgency=low + + * Fixing up dependencies forcing versioned kdelibs + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 05:00:00 -0700 + +kdebase (4:2.0-20000927-1) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 27 Sep 2000 22:00:00 -0700 + +kdebase (4:2.0-20000925-3) unstable; urgency=low + + * More upstream fixes + * Fixing crypto support + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 27 Sep 2000 18:00:00 -0700 + +kdebase (4:2.0-20000925-2) unstable; urgency=low + + * More upstream fixes + * More build-depend cleanup + * Clean build against new libc6 + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 26 Sep 2000 22:30:00 -0700 + +kdebase (4:2.0-20000925-0) unstable; urgency=low + + * More upstream fixes + * More build-depend cleanup + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 25 Sep 2000 15:30:00 -0700 + +kdebase (4:2.0-20000923-0) unstable; urgency=low + + * More upstream fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 23 Sep 2000 00:30:00 -0700 + +kdebase (4:2.0-20000920-2) unstable; urgency=low + + * Trying some build tweaks + * Fixing build-depends some more + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Sep 2000 15:00:00 -0700 + +kdebase (4:2.0-20000920-0) unstable; urgency=low + + * More upstream fixes + * Rebuild on kdelibs3-nossl + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 20 Sep 2000 23:00:00 -0700 + +kdebase (4:2.0-20000918-0) unstable; urgency=low + + * More upstream fixes (-beta5) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Sep 2000 17:30:00 -0700 + +kdebase (4:2.0-20000912-0) unstable; urgency=low + + * More upstream fixes + * Fixing typo in menu for kde window manager (Closes: #71395) + * Adding in menu-method fix to use .desktop instead of .kdelnk + * More copyright updates + * Fixing startmenu LD_LIBRARY_PATH problem (Closes: #10390) + * Fixing up Debian menu entries (Closes: #71402) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 12 Sep 2000 09:00:00 -0700 + +kdebase (4:2.0-20000910-2) unstable; urgency=low + + * Fixing Debian menu graphic problem + * More cleanup of kdm settings + * More dependency fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 10 Sep 2000 23:00:00 -0700 + +kdebase (4:2.0-20000910-0) unstable; urgency=low + + * Changing kdm banner graphic to be the Debian swirl + * Fixing start script so that kde actually starts with the desktop + functional. (sorry) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 10 Sep 2000 11:45:00 -0700 + +kdebase (4:2.0-20000909-0) unstable; urgency=low + + * More upstream updates + * More kdm cleanup (star'd password option added) + * Migrating binary-indep build pieces into their own area + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 01:00:00 -0700 + +kdebase (4:2.0-20000907-1) unstable; urgency=low + + * New upstream cvs pull + * Built against qt 2.2 final (GPL'd version) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Sep 2000 01:00:00 -0700 + +kdebase (4:2.0-20000905-0) unstable; urgency=low + + * New upstream fixes + * Fixing up sections + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 05 Sep 2000 00:30:00 -0700 + +kdebase (4:2.0-20000901-0) unstable; urgency=low + + * New upstream fixes + * Fixing menu entries for konqueror + * Fixing build issues with random + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 01 Sep 2000 00:02:00 -0700 + +kdebase (4:2.0-20000825-0) unstable; urgency=low + + * New upstream fixes + * Updating kdm init script to match current xdm one + * Typo fixes in kdmrc + * Turning off xconsole by default for kdm + * Some work on menus + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 Aug 2000 21:30:00 -0700 + +kdebase (4:2.0-20000821-1.0) experimental; urgency=low + + * New upstream fixes + * changed xdm.options to kdm.options to seperate from xdm + * cleaned up pre/post scripts for kdm to handle proper upgrade from + kdm1. Forcing a restart (if possible and without killing the upgrade) + during an upgrade. + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 21 Aug 2000 22:45:00 -0700 + +kdebase (4:2.0-20000816-1.0) experimental; urgency=low + + * New upstream beta version + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 16 Aug 2000 22:30:00 -0700 + +kdebase (4:2.0-20000810-1.0) experimental; urgency=low + + * New upstream version + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 10 Aug 2000 02:30:00 -0700 + +kdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low + + * Adding in a conflict for man2html since we provide it + * Fixing ln issues with documentation + * Fixing file permissions in CVS tree + * Fixing some kdm issues + * Changing suggest to depend for kde-i18n since some documentation, etc + resides in that package now. (including english) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 21 May 2000 02:30:00 -0700 + +kdebase-cvs (4:2.0-20000512-1.0) experimental; urgency=low + + * New upstream beta version + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 12 May 2000 22:30:00 -0700 + +kdebase-cvs (4:2.0-20000314-1.0) experimental; urgency=low + + * New upstream CVS fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Mar 2000 22:30:00 -0700 + +kdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low + + * New upstream CVS fixes + * More shlibs fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 06 Mar 2000 22:30:00 -0700 + +kdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low + + * New upstream CVS fixes + * Migrating chooser over to kdm-cvs package + * Updating kdm config files to match current versions of xdm + * Fixing kdm init.d scripts to handle now missing parser script + * Fixing kicker applet issues (required -dev to be installed to work) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Mar 2000 22:00:00 -0700 + +kdebase-cvs (4:2.0-20000229-1.0) experimental; urgency=low + + * New upstream CVS fixes + * Adding in build-depends + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 29 Feb 2000 22:00:00 -0700 + +kdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low + + * New upstream CVS fixes + * Fixing pathing for kde help files + * Adding in md5 options to pam.d file for kdm + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 23 Feb 2000 22:00:36 -0700 + +kdebase-cvs (4:2.0-19991130-1.0) experimental; urgency=low + + * New upstream CVS fixes + * Removing old update-window-managers piece in leu of new udpate-alternatives + * Adding missing dependencies - grep, sed + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Nov 1999 00:30:36 -0400 + +kdebase-cvs (4:2.0-19991128-1.0) experimental; urgency=low + + * New upstream CVS fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 28 Nov 1999 03:30:36 -0400 + +kdebase-cvs (4:2.0-19991020-1.0) experimental; urgency=low + + * New upstream CVS fixes + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 20 Oct 1999 08:30:36 -0400 + +kdebase-cvs (4:2.0-19991001-0.1) experimental; urgency=low + + * new upstream version + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 01 Oct 1999 14:30:36 -0400 + +kdebase-cvs (4:2.0-19990912-1.0) experimental; urgency=low + + * new upstream version + * Cleaning up debian subtree: removing old window-managers file + * Finishing migration to /usr/share/doc + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 12 Sep 1999 15:00:36 -0400 + +kdebase-cvs (4:2.0-19990903-1.0) experimental; urgency=low + + * new upstream version + + -- Stephan Kulow <coolo@kde.org> Fri, 3 Sep 1999 21:51:36 +0200 + +kdebase-cvs (4:2.0-19990825-1.0) experimental; urgency=low + + * New upstream CVS changes + * Fixes problem with /usr/bin/kde2 (missing a / ) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Aug 1999 13:00:56 -0400 + +kdebase-cvs (4:2.0-19990825-1) experimental; urgency=low + + * New upstream CVS changes + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Aug 1999 07:00:56 -0400 + +kdebase-cvs (4:2.0-19990823-1) experimental; urgency=low + + * New upstream CVS changes + * Fixes bug with init.d script for kdm2 + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Aug 1999 07:00:56 -0400 + +kdebase-cvs (4:2.0-19990820-1.1) experimental; urgency=low + + * several small package fixes mainly with pathing + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 21 Aug 1999 00:30:56 -0400 + +kdebase-cvs (4:2.0-19990820-1) experimental; urgency=low + + * new CVS version + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 20 Aug 1999 13:30:56 -0400 + +kdebase-cvs (4:2.0-19990626-2) experimental; urgency=low + + * new version + + -- Stephan Kulow <coolo@kde.org> Sat, 26 Jun 1999 22:37:56 +0200 + +kdebase-cvs (4:2.0-19990626-1) experimental; urgency=low + + * New upstream CVS version + * Brought in sync with -stable tree + * Adding in -include statements into the ./configure piece + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 26 Jun 1999 06:00:29 -0400 + +kdebase-cvs (4:2.0-19990620-1) experimental; urgency=low + + * New upstream CVS version + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 20 Jun 1999 11:00:29 -0400 + +kdebase-cvs (4:2.0-19990601-1) experimental; urgency=low + + * New upstream CVS version + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 01 Jun 1999 01:00:29 -0400 + +kdebase-cvs (4:2.0-19990531-1) experimental; urgency=low + + * Making kdm not require xdm + * Fixing some pam stuff which includes a /etc/pam.d/kde file, making + the pam name=kde so that it uses the /etc/pam.d/kde file instead of + xdm, kdm, or whatever. + * Fixing the linux fonts for konsole. + * Fixing the /var/state/kdm issue + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 31 May 1999 19:30:29 -0400 + +kdebase-cvs (4:2.0-19990524-1) experimental; urgency=low + + * migrating back to / from /opt + * working in new build changes to bring package more in line with + current Debian dist + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 24 May 1999 07:00:29 -0400 + +kdebase-cvs (4:2.0-19990314-3) experimental; urgency=low + + * fixing some lintian problems + + -- Stephan Kulow <coolo@kde.org> Mon, 15 Mar 1999 17:17:29 +0100 + +kdebase-cvs (4:2.0-19990314-2) experimental; urgency=low + + * taking out the undocumented call + + -- Stephan Kulow <coolo@kde.org> Mon, 15 Mar 1999 16:42:47 +0100 + +kdebase-cvs (4:2.0-19990314-1) experimental; urgency=low + + * moving the -cvs from version to package name + + -- Stephan Kulow <coolo@kde.org> Sun, 14 Mar 1999 21:01:10 +0100 + +kdebase-cvs (4:2.0-19990314-cvs-1) experimental; urgency=low + + * using newest kdelibs + + -- Stephan Kulow <coolo@kde.org> Sun, 14 Mar 1999 00:16:36 +0100 + +kdebase (4:2.0-19990309-1) experimental; urgency=low + + * new upstream version with Qt 2.0 + + -- Stephan Kulow <coolo@kde.org> Tue, 9 Mar 1999 23:56:08 +0100 + +kdebase (4:1.1-19990306-1) unstable; urgency=low + + * new upstream version out of CVS (many translation updates and some + security fixes + + -- Stephan Kulow <coolo@kde.org> Sat, 6 Mar 1999 18:03:04 +0100 + +kdebase (4:1.1-19990217-1) unstable; urgency=low + + * new upstream version + + -- Stephan Kulow <coolo@kde.org> Wed, 17 Feb 1999 19:09:41 +0100 + +kdebase (4:1.1-19990214-2) unstable; urgency=low + + * move the link from /var/ to /usr, since /usr may be read only + * patch Xserver_0 to run kdmgreeter if kdm runs + + -- Stephan Kulow <coolo@kde.org> Tue, 16 Feb 1999 18:52:03 +0100 + +kdebase (4:1.1-19990214-1) unstable; urgency=low + + * fix some bugs (krdb & menu) + + -- Stephan Kulow <coolo@kde.org> Sun, 14 Feb 1999 21:29:34 +0100 + +kdebase (4:1.1-19990207-3) unstable; urgency=low + + * new kdmrc handling + + -- Stephan Kulow <coolo@kde.org> Fri, 12 Feb 1999 11:03:56 +0100 + +kdebase (4:1.1-19990207-2) unstable; urgency=low + + * followed the suggestion of Russel Cooker and splited kdebase + * fixed a bug with the jpeglib version + + -- Stephan Kulow <coolo@kde.org> Tue, 9 Feb 1999 09:59:11 +0100 + +kdebase (4:1.1-19990207-1) unstable; urgency=low + + * new upstream version 1.1 and new epoche + + -- Stephan Kulow <coolo@kde.org> Sun, 7 Feb 1999 12:12:58 +0100 + +kdebase (2:980710-1.0-1) unstable; urgency=low + + * new upstream version 1.0 + + -- Stephan Kulow <coolo@kde.org> Sun, 12 Jul 1998 14:44:00 +0200 + +kdebase (2:980419-b4-1) unstable; urgency=low + + * new upstream version Beta4 + + -- Stephan Kulow <coolo@kde.org> Sun, 19 Apr 1998 15:04:38 +0200 + +kdebase (2:980312-5) unstable; urgency=low + + * remove kwm from /etc/X11/window-managers in postrm + + -- Stephan Kulow <coolo@kde.org> Fri, 3 Apr 1998 18:42:12 +0200 + +kdebase (2:980312-4) frozen; urgency=low + + * added undocumented man page + * renamed kdmconfig to switchdm. This name existed twice + * new compile with latest kdelibs shlibs + + -- Stephan Kulow <coolo@kde.org> Tue, 31 Mar 1998 20:26:23 +0200 + +kdebase (2:980312-3) unstable; urgency=low + + * use debhelper tools now + * changed the directory for debian apps to /var/spool/applnk + * set the correct UTMP file + * test prefix() before removing it. This should avoid a rm -rf /, when possible + * new kdm (with bugfixes and new location for configuration files) + + -- Stephan Kulow <coolo@kde.org> Fri, 27 Mar 1998 16:07:37 +0100 + +kdebase (2:980312-2) frozen; urgency=low + + * new compile cycle with qt-1.33 and libstd++-2.8 + + -- Stephan Kulow <coolo@kde.org> Tue, 24 Mar 1998 19:07:00 +0100 + +kdebase (2:980312-1) experimental; urgency=low + + * added -O2 to CXXFLAGS + * New upstream release + + -- Stephan Kulow <coolo@kde.org> Thu, 12 Mar 1998 23:05:14 +0100 + +kdebase (2:980310-1) experimental; urgency=low + + * disable the run of kappfinder to not create a non-KDE apps like menu twice + * changed the README.debian file to reflect the new state of this package + * New upstream release + + -- Stephan Kulow <coolo@kde.org> Mon, 9 Mar 1998 23:12:46 +0100 + +kdebase (980228-1) experimental; urgency=low + + * New upstream release + + -- Stephan Kulow <coolo@kde.org> Sat, 28 Feb 1998 21:21:55 +0100 + +kdebase (980227-1) experimental; urgency=low + + * added *.moc to the clean target + * added po/no/Makefile to configure.in + * disabled all sound applications, because mediatool is broken + * disabled rpath + * changed section to contrib + * New upstream release + + -- Stephan Kulow <coolo@kde.org> Fri, 27 Feb 1998 20:06:44 +0100 + +kdebase (1:980225-1) experimental; urgency=low + + * New upstream release + + -- Stephan Kulow <coolo@kde.org> Wed, 25 Dec 1998 21:48:23 +0100 + +kdebase (1:Beta2-2.1) experimental; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Fri, 5 Dec 1997 21:18:40 +0100 + +kdebase (1:Beta2-2) unstable; urgency=low + + * fixed kde / startkde script. added minimal documentation. + * fixed klock permissions. + * removed startkde script. + * removed virtual package names. + * fixed utmp file location in kvt. + + -- Andreas Jellinghaus <aj@debian.org> Sat, 29 Nov 1997 12:53:41 +0100 + +kdebase (1:Beta2-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Sun, 23 Nov 1997 22:27:46 +0100 + +kdebase (1:Beta1.2-2) unstable; urgency=low + + * start kdepanel only once. + * fixed kfm bug. + + -- Andreas Jellinghaus <aj@debian.org> Sun, 9 Nov 1997 17:37:38 +0100 + +kdebase (1:Beta1.2-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 27 Oct 1997 11:49:11 +0100 + +kdebase (1:Beta1.1-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 20 Oct 1997 11:44:11 +0200 + +kdebase (971019-1) unstable; urgency=low + + * added module support to kde menu-method (untested) + * dependency on new menu version with extensions for kde + * new menu method (thanks joost) + * Fixed screen saver path (debian paths) + * New upstream release + * Fixed more paths (debian paths) + + -- Andreas Jellinghaus <aj@debian.org> Sun, 19 Oct 1997 12:53:44 +0200 + +kdebase (971013-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 13 Oct 1997 08:23:08 +0200 + +kdebase (971011-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Sun, 12 Oct 1997 12:13:25 +0200 + +kdebase (971009-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Thu, 9 Oct 1997 10:51:49 +0200 + +kdebase (971008-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Wed, 8 Oct 1997 10:07:59 +0200 + +kdebase (971006-2) unstable; urgency=low + + * daily recompile of everything. + + -- Andreas Jellinghaus <aj@debian.org> Tue, 7 Oct 1997 10:56:23 +0200 + +kdebase (971006-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 6 Oct 1997 09:24:17 +0200 + +kdebase (971005-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Sun, 5 Oct 1997 17:32:13 +0200 + +kdebase (971003-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Fri, 3 Oct 1997 08:23:44 +0200 + +kdebase (971002-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Thu, 2 Oct 1997 08:52:11 +0200 + +kdebase (970930-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Tue, 30 Sep 1997 11:56:08 +0200 + +kdebase (970929-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 29 Sep 1997 09:40:07 +0200 + +kdebase (970925-2) unstable; urgency=low + + * daily recompile of everything. + + -- Andreas Jellinghaus <aj@debian.org> Fri, 26 Sep 1997 08:55:56 +0200 + +kdebase (970925-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Thu, 25 Sep 1997 08:08:36 +0200 + +kdebase (970924-2) unstable; urgency=low + + * now use kderules. + * daily recompile of everything. + + -- Andreas Jellinghaus <aj@debian.org> Wed, 24 Sep 1997 10:36:09 +0200 + +kdebase (970924-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Wed, 24 Sep 1997 08:32:38 +0200 + +kdebase (970923-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Tue, 23 Sep 1997 08:40:36 +0200 + +kdebase (970922-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Mon, 22 Sep 1997 09:30:58 +0200 + +kdebase (970921-1) unstable; urgency=low + + * New upstream release + + -- Andreas Jellinghaus <aj@debian.org> Sun, 21 Sep 1997 13:50:08 +0200 + +kdebase (970920-1) unstable; urgency=low + + * Initial Release. + + -- Andreas Jellinghaus <aj@debian.org> Sat, 20 Sep 1997 10:36:15 +0200 --- kdebase-3.5.6.orig/kicker/libkicker/Makefile.in +++ kdebase-3.5.6/kicker/libkicker/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -611,7 +620,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -649,9 +658,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/tom/Makefile.in +++ kdebase-3.5.6/kicker/menuext/tom/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -597,7 +606,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -635,9 +644,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/kdeprint/Makefile.in +++ kdebase-3.5.6/kicker/menuext/kdeprint/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/find/Makefile.in +++ kdebase-3.5.6/kicker/menuext/find/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -596,7 +605,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -634,9 +643,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/Makefile.in +++ kdebase-3.5.6/kicker/menuext/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/menuext/system/Makefile.in +++ kdebase-3.5.6/kicker/menuext/system/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/recentdocs/Makefile.in +++ kdebase-3.5.6/kicker/menuext/recentdocs/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -597,7 +606,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -635,9 +644,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/remote/Makefile.in +++ kdebase-3.5.6/kicker/menuext/remote/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/prefmenu/Makefile.in +++ kdebase-3.5.6/kicker/menuext/prefmenu/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/konsole/Makefile.in +++ kdebase-3.5.6/kicker/menuext/konsole/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/konq-profiles/Makefile.in +++ kdebase-3.5.6/kicker/menuext/konq-profiles/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -595,7 +604,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -633,9 +642,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/menuext/kate/Makefile.in +++ kdebase-3.5.6/kicker/menuext/kate/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -593,7 +602,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -631,9 +640,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/extensions/dockbar/Makefile.in +++ kdebase-3.5.6/kicker/extensions/dockbar/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/extensions/taskbar/Makefile.in +++ kdebase-3.5.6/kicker/extensions/taskbar/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -610,7 +619,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -648,9 +657,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/extensions/sidebar/Makefile.in +++ kdebase-3.5.6/kicker/extensions/sidebar/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/extensions/Makefile.in +++ kdebase-3.5.6/kicker/extensions/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/extensions/kasbar/Makefile.in +++ kdebase-3.5.6/kicker/extensions/kasbar/Makefile.in @@ -179,6 +179,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -322,6 +323,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -372,6 +376,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -379,12 +384,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -405,10 +407,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -417,6 +422,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -578,6 +584,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -585,10 +592,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -654,7 +663,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -692,9 +701,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/taskbar/Makefile.in +++ kdebase-3.5.6/kicker/taskbar/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -607,7 +616,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -645,9 +654,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/proxy/Makefile.in +++ kdebase-3.5.6/kicker/proxy/Makefile.in @@ -184,6 +184,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -327,6 +328,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -377,6 +381,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -384,12 +389,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -410,10 +412,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -422,6 +427,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -583,6 +589,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -590,10 +597,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -638,7 +647,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -676,9 +685,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/Makefile.in +++ kdebase-3.5.6/kicker/Makefile.in @@ -124,6 +124,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -267,6 +268,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -317,6 +321,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -324,12 +329,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -350,10 +352,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -362,6 +367,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -523,6 +529,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -530,10 +537,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -559,7 +568,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -597,9 +606,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/data/kmenu_side/Makefile.in +++ kdebase-3.5.6/kicker/data/kmenu_side/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/data/app_start_anim/Makefile.in +++ kdebase-3.5.6/kicker/data/app_start_anim/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/data/wallpaper/Makefile.in +++ kdebase-3.5.6/kicker/data/wallpaper/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/data/tiles/Makefile.in +++ kdebase-3.5.6/kicker/data/tiles/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/data/Makefile.in +++ kdebase-3.5.6/kicker/data/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/data/icons/actions/Makefile.in +++ kdebase-3.5.6/kicker/data/icons/actions/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/data/icons/Makefile.in +++ kdebase-3.5.6/kicker/data/icons/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -559,7 +568,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -597,9 +606,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/applets/clock/Makefile.in +++ kdebase-3.5.6/kicker/applets/clock/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/taskbar/Makefile.in +++ kdebase-3.5.6/kicker/applets/taskbar/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/naughty/Makefile.in +++ kdebase-3.5.6/kicker/applets/naughty/Makefile.in @@ -160,6 +160,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -303,6 +304,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -353,6 +357,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -360,12 +365,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -386,10 +388,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -398,6 +403,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -559,6 +565,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -566,10 +573,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -615,7 +624,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -653,9 +662,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/systemtray/Makefile.in +++ kdebase-3.5.6/kicker/applets/systemtray/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/trash/Makefile.in +++ kdebase-3.5.6/kicker/applets/trash/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -604,7 +613,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -642,9 +651,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/swallow/Makefile.in +++ kdebase-3.5.6/kicker/applets/swallow/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/Makefile.in +++ kdebase-3.5.6/kicker/applets/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kicker/applets/menu/Makefile.in +++ kdebase-3.5.6/kicker/applets/menu/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -602,7 +611,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -640,9 +649,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/run/Makefile.in +++ kdebase-3.5.6/kicker/applets/run/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/lockout/Makefile.in +++ kdebase-3.5.6/kicker/applets/lockout/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -597,7 +606,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -635,9 +644,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/media/Makefile.in +++ kdebase-3.5.6/kicker/applets/media/Makefile.in @@ -62,15 +62,17 @@ LTLIBRARIES = $(kde_module_LTLIBRARIES) am__DEPENDENCIES_1 = media_panelapplet_la_DEPENDENCIES = ../../../libkonq/libkonq.la \ - ../../libkicker/libkickermain.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + ../../libkicker/libkickermain.la \ + ../../../kioslave/media/libmediacommon/libmediacommon.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_media_panelapplet_la_OBJECTS = preferencesdialog.lo mediumbutton.lo \ mediaapplet.lo #>- media_panelapplet_la_OBJECTS = $(am_media_panelapplet_la_OBJECTS) #>+ 5 media_panelapplet_la_final_OBJECTS = media_panelapplet_la.all_cpp.lo media_panelapplet_la_nofinal_OBJECTS = preferencesdialog.lo mediumbutton.lo \ - mediaapplet.lo + mediaapplet.lo mediaapplet_skel.lo @KDE_USE_FINAL_FALSE@media_panelapplet_la_OBJECTS = $(media_panelapplet_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@media_panelapplet_la_OBJECTS = $(media_panelapplet_la_final_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -159,6 +161,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +305,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +358,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +366,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +389,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +404,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +566,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +574,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -588,23 +599,27 @@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ -INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kicker/libkicker $(all_includes) +INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kicker/libkicker $(all_includes) -I$(top_srcdir)/kioslave/media/libmediacommon kde_module_LTLIBRARIES = media_panelapplet.la -media_panelapplet_la_SOURCES = preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp +#>- media_panelapplet_la_SOURCES = mediaapplet.skel preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp +#>+ 1 +media_panelapplet_la_SOURCES= preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp mediaapplet_skel.cpp #>- METASOURCES = AUTO noinst_HEADERS = mediaapplet.h mediumbutton.h preferencesdialog.h lnkdir = $(kde_datadir)/kicker/applets lnk_DATA = mediaapplet.desktop EXTRA_DIST = $(lnk_DATA) media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) +media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la ../../../kioslave/media/libmediacommon/libmediacommon.la \ + $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) + #>- all: all-am #>+ 1 all: docs-am all-am .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -642,9 +657,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -850,7 +865,7 @@ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ #>- mostlyclean-am #>+ 2 -clean-am: clean-metasources clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ +clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am @@ -925,6 +940,12 @@ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: +#>+ 5 +mediaapplet.kidl: $(srcdir)/mediaapplet.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/mediaapplet.h > mediaapplet.kidl || ( rm -f mediaapplet.kidl ; false ) +mediaapplet_skel.cpp: mediaapplet.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mediaapplet.kidl + #>+ 8 media_panelapplet.la.closure: $(media_panelapplet_la_OBJECTS) $(media_panelapplet_la_DEPENDENCIES) @echo "int main() {return 0;}" > media_panelapplet_la_closure.cpp @@ -962,6 +983,11 @@ #>+ 2 KDE_DIST=Makefile.in mediaapplet.desktop Makefile.am +#>+ 4 +clean-idl: + -rm -f \ + mediaapplet_skel.cpp mediaapplet_skel.h mediaapplet.kidl + #>+ 3 clean-closures: -rm -f media_panelapplet.la.closure @@ -1008,11 +1034,11 @@ #>+ 11 -media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp preferencesdialog.moc mediaapplet.moc mediumbutton.moc +media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp mediaapplet_skel.cpp preferencesdialog.moc mediaapplet.moc mediumbutton.moc @echo 'creating media_panelapplet_la.all_cpp.cpp ...'; \ rm -f media_panelapplet_la.all_cpp.files media_panelapplet_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> media_panelapplet_la.all_cpp.final; \ - for file in preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp ; do \ + for file in preferencesdialog.cpp mediumbutton.cpp mediaapplet.cpp mediaapplet_skel.cpp ; do \ echo "#include \"$$file\"" >> media_panelapplet_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_panelapplet_la.all_cpp.final; \ done; \ --- kdebase-3.5.6.orig/kicker/applets/minipager/Makefile.in +++ kdebase-3.5.6/kicker/applets/minipager/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -610,7 +619,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -648,9 +657,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/applets/launcher/Makefile.in +++ kdebase-3.5.6/kicker/applets/launcher/Makefile.in @@ -168,6 +168,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -311,6 +312,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -361,6 +365,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -368,12 +373,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -394,10 +396,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -406,6 +411,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -567,6 +573,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -574,10 +581,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -621,7 +630,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -659,9 +668,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/kicker/ui/Makefile.in +++ kdebase-3.5.6/kicker/kicker/ui/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -630,7 +639,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -668,9 +677,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kicker/kicker/Makefile.in +++ kdebase-3.5.6/kicker/kicker/Makefile.in @@ -202,6 +202,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -345,6 +346,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -395,6 +399,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -402,12 +407,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -428,10 +430,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -440,6 +445,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -601,6 +607,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -608,10 +615,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -661,7 +670,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -699,9 +708,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kicker/kicker/buttons/Makefile.in +++ kdebase-3.5.6/kicker/kicker/buttons/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -611,7 +620,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -649,9 +658,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kicker/kicker/core/Makefile.in +++ kdebase-3.5.6/kicker/kicker/core/Makefile.in @@ -164,6 +164,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -307,6 +308,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -357,6 +361,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -364,12 +369,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -390,10 +392,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -402,6 +407,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -563,6 +569,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -570,10 +577,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -630,7 +639,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -668,9 +677,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kicker/taskmanager/Makefile.in +++ kdebase-3.5.6/kicker/taskmanager/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -596,7 +605,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -634,9 +643,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksysguard/CContLib/Makefile.in +++ kdebase-3.5.6/ksysguard/CContLib/Makefile.in @@ -132,6 +132,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -275,6 +276,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -325,6 +329,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -332,12 +337,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -358,10 +360,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -370,6 +375,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -531,6 +537,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -538,10 +545,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -571,7 +580,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -609,9 +618,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/pics/Makefile.in +++ kdebase-3.5.6/ksysguard/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksysguard/Makefile.in +++ kdebase-3.5.6/ksysguard/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -562,7 +571,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -600,9 +609,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/ksysguard/ksysguardd/OpenBSD/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/OpenBSD/Makefile.in @@ -132,6 +132,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -275,6 +276,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -325,6 +329,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -332,12 +337,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -358,10 +360,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -370,6 +375,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -531,6 +537,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -538,10 +545,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -571,7 +580,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -609,9 +618,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/ksysguardd/NetBSD/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/NetBSD/Makefile.in @@ -139,6 +139,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -282,6 +283,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -332,6 +336,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -339,12 +344,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -365,10 +367,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -377,6 +382,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -538,6 +544,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -545,10 +552,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -579,7 +588,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -617,9 +626,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/ksysguardd/Tru64/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/Tru64/Makefile.in @@ -142,6 +142,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -285,6 +286,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -335,6 +339,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -342,12 +347,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -368,10 +370,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -380,6 +385,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -541,6 +547,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -548,10 +555,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -584,7 +593,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -622,9 +631,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksysguard/ksysguardd/Irix/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/Irix/Makefile.in @@ -134,6 +134,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -277,6 +278,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -327,6 +331,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -334,12 +339,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -360,10 +362,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -372,6 +377,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -533,6 +539,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -540,10 +547,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -572,7 +581,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -610,9 +619,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/ksysguardd/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -604,7 +613,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -642,9 +651,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksysguard/ksysguardd/Linux/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/Linux/Makefile.in @@ -140,6 +140,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -283,6 +284,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -333,6 +337,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -340,12 +345,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -366,10 +368,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -378,6 +383,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -539,6 +545,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -546,10 +553,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -585,7 +594,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -623,9 +632,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/ksysguardd/FreeBSD/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/FreeBSD/Makefile.in @@ -139,6 +139,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -282,6 +283,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -332,6 +336,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -339,12 +344,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -365,10 +367,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -377,6 +382,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -538,6 +544,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -545,10 +552,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -579,7 +588,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -617,9 +626,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/ksysguardd/Solaris/Makefile.in +++ kdebase-3.5.6/ksysguard/ksysguardd/Solaris/Makefile.in @@ -140,6 +140,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -283,6 +284,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -333,6 +337,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -340,12 +345,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -366,10 +368,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -378,6 +383,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -539,6 +545,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -546,10 +553,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -578,7 +587,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -616,9 +625,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/gui/SensorDisplayLib/Makefile.in +++ kdebase-3.5.6/ksysguard/gui/SensorDisplayLib/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -652,7 +661,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -690,9 +699,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/ksysguard/gui/Makefile.in +++ kdebase-3.5.6/ksysguard/gui/Makefile.in @@ -212,6 +212,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -355,6 +356,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -405,6 +409,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -412,12 +417,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -438,10 +440,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -450,6 +455,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -611,6 +617,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -618,10 +625,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -702,7 +711,7 @@ .SUFFIXES: .SUFFIXES: .c .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -740,9 +749,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -1261,7 +1270,7 @@ messages: rc.cpp $(EXTRACTRC) `find . -name "*.ui"` >> rc.cpp - $(EXTRACTATTR) --attr=display,title SystemLoad.sgrd KSysGuardApplet.xml >> rc.cpp + extractattr --attr=display,title SystemLoad.sgrd KSysGuardApplet.xml >> rc.cpp $(XGETTEXT) `find . -name "*.cpp" -o -name "*.cc"` -o $(podir)/ksysguard.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- kdebase-3.5.6.orig/ksysguard/gui/ksgrd/Makefile.in +++ kdebase-3.5.6/ksysguard/gui/ksgrd/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -627,7 +636,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -665,9 +674,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/ksysguard/example/Makefile.in +++ kdebase-3.5.6/ksysguard/example/Makefile.in @@ -119,6 +119,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -262,6 +263,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -312,6 +316,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -319,12 +324,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -345,10 +347,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -357,6 +362,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -518,6 +524,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -525,10 +532,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/nsplugins/Makefile.in +++ kdebase-3.5.6/nsplugins/Makefile.in @@ -188,6 +188,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -331,6 +332,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -381,6 +385,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -388,12 +393,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -414,10 +416,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -426,6 +431,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -587,6 +593,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -594,10 +601,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -652,7 +661,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -690,9 +699,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/nsplugins/wrapper/Makefile.in +++ kdebase-3.5.6/nsplugins/wrapper/Makefile.in @@ -135,6 +135,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -278,6 +279,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,6 +332,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -335,12 +340,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -361,10 +363,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -373,6 +378,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -534,6 +540,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -541,10 +548,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -573,7 +582,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -611,9 +620,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/nsplugins/viewer/Makefile.in +++ kdebase-3.5.6/nsplugins/viewer/Makefile.in @@ -147,6 +147,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -290,6 +291,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -340,6 +344,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -347,12 +352,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -373,10 +375,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -385,6 +390,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -546,6 +552,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -553,10 +560,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -593,7 +602,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -631,9 +640,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/nsplugins/test/Makefile.in +++ kdebase-3.5.6/nsplugins/test/Makefile.in @@ -140,6 +140,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -283,6 +284,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -333,6 +337,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -340,12 +345,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -366,10 +368,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -378,6 +383,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -539,6 +545,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -546,10 +553,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -581,7 +590,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -619,9 +628,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-checkPROGRAMS: --- kdebase-3.5.6.orig/kioslave/finger/Makefile.in +++ kdebase-3.5.6/kioslave/finger/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/cgi/Makefile.in +++ kdebase-3.5.6/kioslave/cgi/Makefile.in @@ -167,6 +167,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -310,6 +311,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -360,6 +364,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -367,12 +372,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -393,10 +395,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -405,6 +410,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -566,6 +572,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -573,10 +580,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -612,7 +621,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -650,9 +659,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/cgi/kcmcgi/Makefile.in +++ kdebase-3.5.6/kioslave/cgi/kcmcgi/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/info/Makefile.in +++ kdebase-3.5.6/kioslave/info/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -607,7 +616,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -645,9 +654,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/tar/Makefile.in +++ kdebase-3.5.6/kioslave/tar/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -606,7 +615,7 @@ .SUFFIXES: .SUFFIXES: .cc .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -644,9 +653,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/filter/Makefile.in +++ kdebase-3.5.6/kioslave/filter/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/floppy/Makefile.in +++ kdebase-3.5.6/kioslave/floppy/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/trash/Makefile.in +++ kdebase-3.5.6/kioslave/trash/Makefile.in @@ -186,6 +186,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -329,6 +330,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -379,6 +383,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -386,12 +391,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -412,10 +414,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -424,6 +429,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -585,6 +591,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -592,10 +599,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -640,7 +649,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -678,9 +687,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/trash/kfile-plugin/Makefile.in +++ kdebase-3.5.6/kioslave/trash/kfile-plugin/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/settings/Makefile.in +++ kdebase-3.5.6/kioslave/settings/Makefile.in @@ -167,6 +167,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -310,6 +311,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -360,6 +364,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -367,12 +372,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -393,10 +395,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -405,6 +410,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -566,6 +572,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -573,10 +580,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -613,7 +622,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -651,9 +660,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/Makefile.in +++ kdebase-3.5.6/kioslave/Makefile.in @@ -125,6 +125,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -268,6 +269,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -318,6 +322,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -325,12 +330,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -351,10 +353,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -363,6 +368,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -524,6 +530,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -531,10 +538,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -565,7 +574,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -603,9 +612,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kioslave/system/kdedmodule/Makefile.in +++ kdebase-3.5.6/kioslave/system/kdedmodule/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -601,7 +610,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -639,9 +648,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/system/entries/Makefile.in +++ kdebase-3.5.6/kioslave/system/entries/Makefile.in @@ -120,6 +120,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -263,6 +264,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -313,6 +317,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -320,12 +325,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -346,10 +348,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -358,6 +363,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -519,6 +525,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -526,10 +533,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/system/Makefile.in +++ kdebase-3.5.6/kioslave/system/Makefile.in @@ -180,6 +180,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -323,6 +324,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -373,6 +377,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -380,12 +385,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -406,10 +408,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -418,6 +423,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -579,6 +585,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -586,10 +593,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -630,7 +639,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -668,9 +677,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/system/mimetypes/Makefile.in +++ kdebase-3.5.6/kioslave/system/mimetypes/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kioslave/thumbnail/Makefile.in +++ kdebase-3.5.6/kioslave/thumbnail/Makefile.in @@ -198,6 +198,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -341,6 +342,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -391,6 +395,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -398,12 +403,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -424,10 +426,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -436,6 +441,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -597,6 +603,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -604,10 +611,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -680,7 +689,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -718,9 +727,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/fish/Makefile.in +++ kdebase-3.5.6/kioslave/fish/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/sftp/Makefile.in +++ kdebase-3.5.6/kioslave/sftp/Makefile.in @@ -165,6 +165,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -308,6 +309,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -358,6 +362,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -365,12 +370,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -391,10 +393,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -403,6 +408,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -564,6 +570,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -571,10 +578,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -612,7 +621,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -650,9 +659,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/smtp/Makefile.in +++ kdebase-3.5.6/kioslave/smtp/Makefile.in @@ -186,6 +186,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -329,6 +330,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -379,6 +383,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -386,12 +391,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -412,10 +414,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -424,6 +429,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -585,6 +591,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -592,10 +599,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -643,7 +652,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -681,9 +690,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/media/Makefile.in +++ kdebase-3.5.6/kioslave/media/Makefile.in @@ -182,6 +182,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -325,6 +326,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -375,6 +379,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -382,12 +387,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -408,10 +410,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -420,6 +425,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -581,6 +587,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -588,10 +595,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -637,7 +646,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -675,9 +684,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/media/libmediacommon/Makefile.in +++ kdebase-3.5.6/kioslave/media/libmediacommon/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kioslave/media/mimetypes/Makefile.in +++ kdebase-3.5.6/kioslave/media/mimetypes/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -571,7 +580,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -609,9 +618,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kioslave/media/services/Makefile.in +++ kdebase-3.5.6/kioslave/media/services/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kioslave/media/kcmodule/Makefile.in +++ kdebase-3.5.6/kioslave/media/kcmodule/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -616,7 +625,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -654,9 +663,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/media/medianotifier/Makefile.in +++ kdebase-3.5.6/kioslave/media/medianotifier/Makefile.in @@ -160,6 +160,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -303,6 +304,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -353,6 +357,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -360,12 +365,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -386,10 +388,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -398,6 +403,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -559,6 +565,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -566,10 +573,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -611,7 +620,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -649,9 +658,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/media/mediamanager/Makefile.in +++ kdebase-3.5.6/kioslave/media/mediamanager/Makefile.in @@ -190,6 +190,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -333,6 +334,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -383,6 +387,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -390,12 +395,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -416,10 +418,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -428,6 +433,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -589,6 +595,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -596,10 +603,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -644,7 +653,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -682,9 +691,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/media/mounthelper/Makefile.in +++ kdebase-3.5.6/kioslave/media/mounthelper/Makefile.in @@ -142,6 +142,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -285,6 +286,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -335,6 +339,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -342,12 +347,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -368,10 +370,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -380,6 +385,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -541,6 +547,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -548,10 +555,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -583,7 +592,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -621,9 +630,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/media/mounthelper/kio_media_mounthelper.h +++ kdebase-3.5.6/kioslave/media/mounthelper/kio_media_mounthelper.h @@ -25,6 +25,7 @@ #include <kapplication.h> #include <qstring.h> #include <kio/job.h> +#include <kurl.h> #include "medium.h" --- kdebase-3.5.6.orig/kioslave/media/kfile-plugin/Makefile.in +++ kdebase-3.5.6/kioslave/media/kfile-plugin/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/media/propsdlgplugin/Makefile.in +++ kdebase-3.5.6/kioslave/media/propsdlgplugin/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -601,7 +610,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -639,9 +648,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/home/kdedmodule/Makefile.in +++ kdebase-3.5.6/kioslave/home/kdedmodule/Makefile.in @@ -155,6 +155,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -298,6 +299,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -348,6 +352,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -355,12 +360,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -381,10 +383,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -393,6 +398,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -554,6 +560,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -561,10 +568,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/home/Makefile.in +++ kdebase-3.5.6/kioslave/home/Makefile.in @@ -180,6 +180,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -323,6 +324,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -373,6 +377,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -380,12 +385,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -406,10 +408,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -418,6 +423,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -579,6 +585,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -586,10 +593,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -631,7 +640,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -669,9 +678,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/smb/Makefile.in +++ kdebase-3.5.6/kioslave/smb/Makefile.in @@ -164,6 +164,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -307,6 +308,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -357,6 +361,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -364,12 +369,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -390,10 +392,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -402,6 +407,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -563,6 +569,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -570,10 +577,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -624,7 +633,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -662,9 +671,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/remote/kdedmodule/Makefile.in +++ kdebase-3.5.6/kioslave/remote/kdedmodule/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -601,7 +610,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -639,9 +648,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/remote/Makefile.in +++ kdebase-3.5.6/kioslave/remote/Makefile.in @@ -180,6 +180,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -323,6 +324,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -373,6 +377,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -380,12 +385,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -406,10 +408,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -418,6 +423,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -579,6 +585,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -586,10 +593,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -631,7 +640,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -669,9 +678,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/ldap/Makefile.in +++ kdebase-3.5.6/kioslave/ldap/Makefile.in @@ -154,6 +154,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -297,6 +298,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -347,6 +351,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -354,12 +359,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -380,10 +382,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -392,6 +397,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -553,6 +559,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -560,10 +567,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -602,7 +611,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -640,9 +649,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/mac/Makefile.in +++ kdebase-3.5.6/kioslave/mac/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/pop3/Makefile.in +++ kdebase-3.5.6/kioslave/pop3/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/nntp/Makefile.in +++ kdebase-3.5.6/kioslave/nntp/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -599,7 +608,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -637,9 +646,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/man/Makefile.in +++ kdebase-3.5.6/kioslave/man/Makefile.in @@ -177,6 +177,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -320,6 +321,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -370,6 +374,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -377,12 +382,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -403,10 +405,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -415,6 +420,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -576,6 +582,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -583,10 +590,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -639,7 +648,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -677,9 +686,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/about/Makefile.in +++ kdebase-3.5.6/kioslave/about/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kioslave/nfs/Makefile.in +++ kdebase-3.5.6/kioslave/nfs/Makefile.in @@ -164,6 +164,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -307,6 +308,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -357,6 +361,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -364,12 +369,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -390,10 +392,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -402,6 +407,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -563,6 +569,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -570,10 +577,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -611,7 +620,7 @@ .SUFFIXES: .SUFFIXES: .c .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -649,9 +658,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khelpcenter/searchhandlers/Makefile.in +++ kdebase-3.5.6/khelpcenter/searchhandlers/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -564,7 +573,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -602,9 +611,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh khc_docbookdig.pl: $(top_builddir)/config.status $(srcdir)/khc_docbookdig.pl.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --- kdebase-3.5.6.orig/khelpcenter/pics/Makefile.in +++ kdebase-3.5.6/khelpcenter/pics/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -544,7 +553,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -582,9 +591,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/khelpcenter/htmlsearch/Makefile.in +++ kdebase-3.5.6/khelpcenter/htmlsearch/Makefile.in @@ -186,6 +186,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -329,6 +330,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -379,6 +383,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -386,12 +391,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -412,10 +414,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -424,6 +429,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -585,6 +591,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -592,10 +599,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -647,7 +656,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -685,9 +694,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khelpcenter/Makefile.in +++ kdebase-3.5.6/khelpcenter/Makefile.in @@ -207,6 +207,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -350,6 +351,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -400,6 +404,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -407,12 +412,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -433,10 +435,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -445,6 +450,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -606,6 +612,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -613,10 +620,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -694,7 +703,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -732,9 +741,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/khelpcenter/plugins/Applications/Makefile.in +++ kdebase-3.5.6/khelpcenter/plugins/Applications/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/khelpcenter/plugins/Manpages/Makefile.in +++ kdebase-3.5.6/khelpcenter/plugins/Manpages/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -555,7 +564,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -593,9 +602,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/khelpcenter/plugins/Makefile.in +++ kdebase-3.5.6/khelpcenter/plugins/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -574,7 +583,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -612,9 +621,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/khelpcenter/plugins/Scrollkeeper/Makefile.in +++ kdebase-3.5.6/khelpcenter/plugins/Scrollkeeper/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/khelpcenter/plugins/Tutorials/Makefile.in +++ kdebase-3.5.6/khelpcenter/plugins/Tutorials/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -553,7 +562,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -591,9 +600,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/acinclude.m4 +++ kdebase-3.5.6/acinclude.m4 @@ -1689,15 +1689,6 @@ KDE_USE_CLOSURE_TRUE="#" KDE_USE_CLOSURE_FALSE="" KDE_NO_UNDEFINED="" - case $host in - *-*-linux-gnu) - KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], - [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], - [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], - [KDE_NO_UNDEFINED=""])], - [KDE_NO_UNDEFINED=""]) - ;; - esac fi AC_SUBST(KDE_USE_CLOSURE_TRUE) AC_SUBST(KDE_USE_CLOSURE_FALSE) @@ -2144,9 +2135,6 @@ save_CXXFLAGS="$CXXFLAGS" kde_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" -if test "$GXX" = "yes"; then -CXXFLAGS="$CXXFLAGS -pedantic-errors" -fi AC_TRY_COMPILE([ $2 ], @@ -5970,30 +5958,15 @@ fi ]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001 +## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ## Free Software Foundation, Inc. ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 ## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a -## configuration script generated by Autoconf, you may include it under -## the same distribution terms that you use for the rest of that program. +## This file is free software; the Free Software Foundation gives +## unlimited permission to copy and/or distribute it, with or without +## modifications, as long as this notice is preserved. -# serial 47 AC_PROG_LIBTOOL +# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -6053,7 +6026,7 @@ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' +LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl # Prevent multiple expansion @@ -6103,7 +6076,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -6123,7 +6096,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -6143,6 +6116,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -6162,15 +6136,17 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +_LT_CC_BASENAME([$compiler]) + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -6211,11 +6187,56 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -6288,15 +6309,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -6465,14 +6486,13 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) - LINUX_64_MODE="32" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6484,7 +6504,6 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" @@ -6518,6 +6537,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -6549,7 +6584,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -6559,8 +6594,10 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -6586,11 +6623,16 @@ LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized + # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi else $2=yes fi @@ -6614,7 +6656,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - testring="ABCD" + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -6643,20 +6685,70 @@ lt_cv_sys_max_cmd_len=8192; ;; - *) + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` - testring=$testring$testring + teststring=$teststring$teststring done - testring= + teststring= # Add a significant safety factor because C++ compilers can tack on massive # amounts of additional arguments before passing them to the linker. # It appears as though 1/2 is a usable value. @@ -6673,7 +6765,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -6681,7 +6773,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -6747,17 +6839,19 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -6769,7 +6863,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -6806,7 +6900,7 @@ lt_cv_dlopen_self=yes ]) ;; - + *) AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], @@ -6840,7 +6934,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -6853,7 +6947,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -6895,20 +6989,13 @@ mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -6920,13 +7007,18 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - if test ! -s out/conftest.err; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi - chmod u+w . - $rm conftest* out/* - rmdir out + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -6985,8 +7077,8 @@ [AC_MSG_CHECKING([how to hardcode library paths into programs]) _LT_AC_TAGVAR(hardcode_action, $1)= if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -7043,7 +7135,7 @@ *) AC_MSG_RESULT([no]) ;; - esac + esac fi ])# AC_LIBTOOL_SYS_LIB_STRIP @@ -7056,7 +7148,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -7066,7 +7158,20 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -7131,7 +7236,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -7140,7 +7245,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[[45]]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -7156,7 +7261,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -7168,7 +7273,8 @@ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ $rm \$dlpath' @@ -7198,7 +7304,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -7221,7 +7327,7 @@ soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -7244,20 +7350,17 @@ dynamic_linker=no ;; -kfreebsd*-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[123]]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -7275,14 +7378,19 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.[[01]]* | freebsdelf3.[[01]]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -7302,9 +7410,9 @@ version_type=sunos need_lib_prefix=no need_version=no - case "$host_cpu" in + case $host_cpu in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -7319,7 +7427,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -7330,7 +7438,7 @@ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -7342,6 +7450,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix3*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -7385,29 +7505,26 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then - libsuff=64 - fi - fi shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -7417,6 +7534,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -7426,7 +7555,7 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -7454,8 +7583,13 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no - need_version=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -7475,7 +7609,7 @@ os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -7493,13 +7627,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -7525,7 +7652,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -7558,6 +7685,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -7571,6 +7721,11 @@ esac AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER @@ -7595,6 +7750,9 @@ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) fi fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi # Extract list of available tagged configurations in $ofile. # Note that this assumes the entire list is on one line. @@ -7621,7 +7779,9 @@ case $tagname in CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then AC_LIBTOOL_LANG_CXX_CONFIG else tagname="" @@ -7683,7 +7843,7 @@ # AC_LIBTOOL_WIN32_DLL # -------------------- -# declare package support for building win32 dll's +# declare package support for building win32 DLLs AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ])# AC_LIBTOOL_WIN32_DLL @@ -7721,7 +7881,7 @@ # AC_DISABLE_SHARED # ----------------- -#- set the default shared flag to --disable-shared +# set the default shared flag to --disable-shared AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no) @@ -7857,7 +8017,7 @@ if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then @@ -7967,7 +8127,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -7999,7 +8159,7 @@ AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes @@ -8026,6 +8186,15 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac ])# AC_PROG_LD_RELOAD_FLAG @@ -8059,44 +8228,36 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi4*) +bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; cygwin*) - lt_cv_deplibs_check_method=pass_all + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' ;; - + mingw* | pw32*) - # win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='win32_libid' + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -8112,7 +8273,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -8128,43 +8289,27 @@ esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" - ;; + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. -linux*) - case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - # the debian people say, arm and glibc 2.3.1 works for them with pass_all - arm* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -8183,32 +8328,22 @@ ;; openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' fi ;; osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) lt_cv_deplibs_check_method=pass_all ;; solaris*) lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' @@ -8229,10 +8364,13 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -8252,36 +8390,43 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi]) NM="$lt_cv_path_NM" @@ -8313,13 +8458,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. +# --enable-ltdl-convenience to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +# (note the single quotes!). If your package is not flat and you're not +# using automake, define top_builddir and top_srcdir appropriately in +# the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case $enable_ltdl_convenience in @@ -8338,13 +8483,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl installable library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided and an installed libltdl is not found, it is -# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -# quotes!). If your package is not flat and you're not using automake, -# define top_builddir and top_srcdir appropriately in the Makefiles. +# --enable-ltdl-install to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# and an installed libltdl is not found, it is assumed to be `libltdl'. +# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and top_srcdir +# appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl @@ -8382,10 +8527,21 @@ # --------------- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ])# _LT_AC_LANG_CXX +# _LT_AC_PROG_CXXCPP +# ------------------ +AC_DEFUN([_LT_AC_PROG_CXXCPP], +[ +AC_REQUIRE([AC_PROG_CXX]) +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +fi +])# _LT_AC_PROG_CXXCPP # AC_LIBTOOL_F77 # -------------- @@ -8425,7 +8581,7 @@ # AC_LIBTOOL_RC -# -------------- +# ------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -8458,36 +8614,9 @@ _LT_AC_SYS_COMPILER -# -# Check for any special shared library compilation flags. -# -_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= -if test "$GCC" = no; then - case $host_os in - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' - ;; - esac -fi -if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then - AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : - else - AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) - _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no - fi -fi - - -# -# Check to make sure the static flag actually works. -# -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -8501,9 +8630,9 @@ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) +AC_LIBTOOL_DLOPEN_SELF -# Report which librarie types wil actually be built +# Report which library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -8512,7 +8641,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -8521,48 +8650,11 @@ fi ;; -aix4*) +aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi - ;; - darwin* | rhapsody*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; - esac - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; + ;; esac AC_MSG_RESULT([$enable_shared]) @@ -8587,7 +8679,7 @@ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -8599,6 +8691,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)= @@ -8616,7 +8709,7 @@ _LT_AC_TAGVAR(compiler_lib_search_path, $1)= # Source file extension for C++ test sources. -ac_ext=cc +ac_ext=cpp # Object file extension for compiled C++ test sources. objext=o @@ -8626,11 +8719,15 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD @@ -8641,18 +8738,18 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else - unset lt_cv_prog_gnu_ld + $as_unset lt_cv_prog_gnu_ld fi if test -n "${lt_cv_path_LDCXX+set}"; then lt_cv_path_LD=$lt_cv_path_LDCXX else - unset lt_cv_path_LD + $as_unset lt_cv_path_LD fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +_LT_CC_BASENAME([$compiler]) # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately @@ -8670,8 +8767,8 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -8697,7 +8794,7 @@ # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists @@ -8727,8 +8824,23 @@ exp_sym_flag='-Bexport' no_entry_flag="" else - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -8745,7 +8857,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -8764,8 +8876,12 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -8774,15 +8890,16 @@ shared_flag='-G' else if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' + shared_flag='${wl}-bM:SRE' fi fi fi - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. @@ -8791,13 +8908,12 @@ _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -8806,22 +8922,32 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; esac ;; @@ -8829,12 +8955,12 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -8843,70 +8969,81 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - darwin* | rhapsody*) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac + if test "$GXX" = yes ; then + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes fi - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi + ;; dgux*) case $cc_basename in - ec++) + ec++*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - ghcx) + ghcx*) # Green Hills C++ Compiler # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -8917,14 +9054,14 @@ ;; esac ;; - freebsd[12]*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -8941,12 +9078,12 @@ # location of the library. case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + aCC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -8955,11 +9092,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -8969,34 +9106,23 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; esac fi - case "$host_cpu" in - hppa*64*) + case $host_cpu in + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; *) _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, @@ -9006,17 +9132,20 @@ esac case $cc_basename in - CC) + CC*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + aCC*) + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -9032,12 +9161,15 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -9048,11 +9180,25 @@ ;; esac ;; + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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' + ;; irix5* | irix6*) case $cc_basename in - CC) + CC*) # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -9063,9 +9209,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi fi _LT_AC_TAGVAR(link_all_deplibs, $1)=yes @@ -9074,16 +9220,16 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -9101,20 +9247,44 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc) + icpc*) # Intel C++ with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - cxx) + pgCC*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -9142,7 +9312,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -9152,7 +9322,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -9163,15 +9333,31 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + openbsd*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; osf3*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9181,14 +9367,14 @@ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9206,7 +9392,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9225,13 +9411,13 @@ ;; osf4* | osf5*) case $cc_basename in - KCC) + KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9240,17 +9426,17 @@ # the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - RCC) + RCC*) # Rational C++ 2.4.1 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ $rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -9269,7 +9455,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -9290,27 +9476,14 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - sco*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - lcc) + lcc*) # Lucid # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -9323,36 +9496,33 @@ ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system - # linker. + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -9360,9 +9530,9 @@ # in the archive. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ;; - gcx) + gcx*) # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' @@ -9372,9 +9542,9 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -9383,9 +9553,9 @@ else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -9398,12 +9568,63 @@ ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -9440,8 +9661,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -9459,7 +9678,7 @@ ])# AC_LIBTOOL_LANG_CXX_CONFIG # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------ +# ------------------------------------ # Figure out "hidden" library dependencies from verbose # compiler output when linking a shared library. # Parse the compiler output and extract the necessary @@ -9513,7 +9732,7 @@ # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` for p in `eval $output_verbose_link_cmd`; do case $p in @@ -9553,7 +9772,7 @@ fi ;; - *.$objext|*.$libext) + *.$objext) # This assumes that the test object file only shows up # once in the compiler output. if test "$p" = "conftest.$objext"; then @@ -9589,13 +9808,37 @@ $rm -f confest.$objext +# PORTME: override above test on systems where it is broken +ifelse([$1],[CXX], +[case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_AC_TAGVAR(predep_objects,$1)= + _LT_AC_TAGVAR(postdep_objects,$1)= + _LT_AC_TAGVAR(postdeps,$1)= + ;; + +solaris*) + case $cc_basename in + CC*) + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + ;; + esac + ;; +esac +]) + case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac ])# AC_LIBTOOL_POSTDEP_PREDEP # AC_LIBTOOL_LANG_F77_CONFIG -# ------------------------ +# -------------------------- # Ensure that the configuration vars for the C compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -9639,12 +9882,16 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${F77-"f77"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +_LT_CC_BASENAME([$compiler]) AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) @@ -9654,7 +9901,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. -case "$host_os" in +case $host_os in aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then @@ -9662,8 +9909,10 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) - test "$enable_shared" = yes && enable_static=no +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi ;; esac AC_MSG_RESULT([$enable_shared]) @@ -9673,8 +9922,6 @@ test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - _LT_AC_TAGVAR(GCC, $1)="$G77" _LT_AC_TAGVAR(LD, $1)="$LD" @@ -9684,8 +9931,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP - AC_LIBTOOL_CONFIG($1) @@ -9714,20 +9959,27 @@ lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${GCJ-"gcj"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change ## the running order or otherwise move them around unless you know exactly @@ -9739,8 +9991,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -9750,7 +10000,7 @@ # AC_LIBTOOL_LANG_RC_CONFIG -# -------------------------- +# ------------------------- # Ensure that the configuration vars for the Windows resource compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. @@ -9774,11 +10024,16 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC _LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes AC_LIBTOOL_CONFIG($1) @@ -9804,11 +10059,12 @@ # without removal of \ escapes. if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST - fi + fi # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -9858,7 +10114,7 @@ _LT_AC_TAGVAR(archive_cmds, $1) | \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ + _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ extract_expsyms_cmds | reload_cmds | finish_cmds | \ @@ -9924,11 +10180,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^X//" +Xsed="$SED -e 1s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # The names of the tagged configurations supported by this script. available_tags= @@ -9959,6 +10215,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -9970,6 +10232,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -9989,7 +10254,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -10020,7 +10285,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -10035,7 +10300,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -10264,7 +10529,10 @@ # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi ])# AC_LIBTOOL_CONFIG @@ -10306,9 +10574,6 @@ # Regexp to match symbols that can be accessed directly from C. sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -10330,14 +10595,30 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" 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'" ;; +linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + 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'" + fi + ;; irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; osf*) symcode='[[BCDEGQRST]]' ;; -solaris* | sysv5*) - symcode='[[BDT]]' +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' ;; sysv4) symcode='[[DFNSTU]]' @@ -10355,14 +10636,17 @@ # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[[ABCDGISTW]]' ;; + symcode='[[ABCDGIRSTW]]' ;; esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -10518,6 +10802,10 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; sysv4*MP*) if test -d /usr/nec; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic @@ -10526,7 +10814,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) ;; *) @@ -10551,18 +10839,28 @@ ;; chorus*) case $cc_basename in - cxch68) + cxch68*) # Green Hills C++ Compiler # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; dgux*) case $cc_basename in - ec++) + ec++*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; - ghcx) + ghcx*) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -10570,22 +10868,22 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in - CC) + CC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; - aCC) + aCC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10598,9 +10896,13 @@ ;; esac ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; irix5* | irix6* | nonstopux*) case $cc_basename in - CC) + CC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' # CC pic flag -KPIC is the default. @@ -10609,20 +10911,26 @@ ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - KCC) + KCC*) # KAI C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - cxx) + ;; + pgCC*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. @@ -10639,25 +10947,25 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ;; *) ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in - KCC) + KCC*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ;; - RCC) + RCC*) # Rational C++ 2.4.1 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; - cxx) + cxx*) # Digital/Compaq C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha @@ -10671,24 +10979,15 @@ ;; psos*) ;; - sco*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - *) - ;; - esac - ;; solaris*) case $cc_basename in - CC) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ;; - gcx) + gcx*) # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ;; @@ -10698,12 +10997,12 @@ ;; sunos4*) case $cc_basename in - CC) + CC*) # Sun C++ 4.x _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - lcc) + lcc*) # Lucid _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; @@ -10713,7 +11012,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; @@ -10721,7 +11020,14 @@ ;; esac ;; - unixware*) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; vxworks*) ;; @@ -10768,6 +11074,11 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. @@ -10784,7 +11095,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10810,6 +11121,16 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -10821,7 +11142,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. - case "$host_cpu" in + case $host_cpu in hppa*64*|ia64*) # +Z the default ;; @@ -10844,13 +11165,20 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - linux*) - case $CC in + linux* | k*bsd*-gnu) + case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. @@ -10865,15 +11193,15 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - sco3.2v5*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' - ;; - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac ;; sunos4*) @@ -10882,7 +11210,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -10895,6 +11223,17 @@ fi ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + uts4*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -10922,7 +11261,7 @@ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) fi -case "$host_os" in +case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= @@ -10931,6 +11270,16 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ;; esac + +# +# Check to make sure the static flag actually works. +# +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) @@ -10955,7 +11304,10 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; + linux* | k*bsd*-gnu) + _LT_AC_TAGVAR(link_all_deplibs, $1)=no ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -10981,7 +11333,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' # include_expsyms should be a list of space-separated symbols to be *always* @@ -10998,7 +11350,8 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= - + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) case $host_os in cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -11008,6 +11361,10 @@ with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -11018,6 +11375,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) @@ -11055,7 +11433,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach <jrb3@best.com> says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi @@ -11065,13 +11443,13 @@ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then @@ -11080,23 +11458,70 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else - ld_shlibs=no + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - netbsd*) + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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' + ;; + + linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<EOF 1>&2 @@ -11110,13 +11535,40 @@ EOF elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + sunos4*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= @@ -11126,24 +11578,19 @@ *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= fi else # PORTME fill in a description of your system's linker (not GNU ld) @@ -11155,7 +11602,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -11177,9 +11624,21 @@ else _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac - # KDE requires run time linking. Make it the default. - aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi @@ -11196,7 +11655,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -11215,8 +11674,12 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi + ;; esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -11224,30 +11687,30 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='-qmkshrobj ${wl}-G' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' else - shared_flag='-qmkshrobj' - fi + shared_flag='${wl}-bM:SRE' + fi fi fi - # Let the compiler handle the export list. - _LT_AC_TAGVAR(always_export_symbols, $1)=no + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX @@ -11256,13 +11719,11 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -bexpall does not export symbols beginning with underscore (_) - _LT_AC_TAGVAR(always_export_symbols, $1)=yes # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -11275,7 +11736,7 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - bsdi4*) + bsdi[[45]]*) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -11285,69 +11746,69 @@ # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' - ;; - esac - fi - ;; + case $host_os in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi ;; dgux*) @@ -11380,8 +11841,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | dragonfly*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -11389,7 +11850,7 @@ hpux9*) if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -11403,47 +11864,62 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; - hpux10* | hpux11*) + hpux10*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else - case "$host_cpu" in - hppa*64*|ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; *) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' @@ -11457,7 +11933,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' @@ -11467,7 +11943,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11490,7 +11966,8 @@ _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' else @@ -11500,7 +11977,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ;; esac @@ -11511,14 +11988,14 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' + _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' @@ -11530,13 +12007,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' # Both c and cxx compiler support -rpath directly _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -11544,21 +12021,15 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - sco3.2v5*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' @@ -11567,8 +12038,18 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -11577,7 +12058,7 @@ if test "x$host_vendor" = xsequent; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -11625,36 +12106,45 @@ fi ;; - sysv4.2uw2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; + runpath_var='LD_RUN_PATH' - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - sysv5*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; uts4*) @@ -11672,11 +12162,6 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -11697,13 +12182,14 @@ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext - + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext deplibs= wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=-v linker_flags=-v verstring= @@ -11831,7 +12317,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in --- kdebase-3.5.6.orig/l10n/Makefile.in +++ kdebase-3.5.6/l10n/Makefile.in @@ -118,6 +118,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -261,6 +262,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -311,6 +315,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -318,12 +323,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -344,10 +346,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -356,6 +361,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -517,6 +523,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -524,10 +531,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -563,7 +572,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -601,9 +610,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kscreensaver/Makefile.in +++ kdebase-3.5.6/kscreensaver/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -607,7 +616,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -645,9 +654,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/tools/Makefile.in +++ kdebase-3.5.6/kwin/tools/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -594,7 +603,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -632,9 +641,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstPROGRAMS: --- kdebase-3.5.6.orig/kwin/tools/decobenchmark/Makefile.in +++ kdebase-3.5.6/kwin/tools/decobenchmark/Makefile.in @@ -141,6 +141,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -284,6 +285,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -334,6 +338,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -341,12 +346,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -367,10 +369,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -379,6 +384,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -540,6 +546,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -547,10 +554,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -581,7 +590,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -619,9 +628,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstPROGRAMS: --- kdebase-3.5.6.orig/kwin/kompmgr/Makefile.in +++ kdebase-3.5.6/kwin/kompmgr/Makefile.in @@ -132,6 +132,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -275,6 +276,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -325,6 +329,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -332,12 +337,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -358,10 +360,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -370,6 +375,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -531,6 +537,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -538,10 +545,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -570,7 +579,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -608,9 +617,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/killer/Makefile.in +++ kdebase-3.5.6/kwin/killer/Makefile.in @@ -141,6 +141,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -284,6 +285,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -334,6 +338,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -341,12 +346,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -367,10 +369,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -379,6 +384,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -540,6 +546,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -547,10 +554,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -581,7 +590,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -619,9 +628,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/pics/Makefile.in +++ kdebase-3.5.6/kwin/pics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kwin/oldheaders/Makefile.in +++ kdebase-3.5.6/kwin/oldheaders/Makefile.in @@ -120,6 +120,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -263,6 +264,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -313,6 +317,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -320,12 +325,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -346,10 +348,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -358,6 +363,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -519,6 +525,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -526,10 +533,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -556,7 +565,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -594,9 +603,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kwin/Makefile.in +++ kdebase-3.5.6/kwin/Makefile.in @@ -191,6 +191,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -334,6 +335,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -384,6 +388,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -391,12 +396,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -417,10 +419,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -429,6 +434,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -590,6 +596,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -597,10 +604,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -658,7 +667,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -696,9 +705,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/data/Makefile.in +++ kdebase-3.5.6/kwin/data/Makefile.in @@ -170,6 +170,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -313,6 +314,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -363,6 +367,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -370,12 +375,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -396,10 +398,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -408,6 +413,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -569,6 +575,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -576,10 +583,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -623,7 +632,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -661,9 +670,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kconfPROGRAMS: $(kconf_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/kcmkwin/kwindecoration/Makefile.in +++ kdebase-3.5.6/kwin/kcmkwin/kwindecoration/Makefile.in @@ -159,6 +159,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -302,6 +303,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -352,6 +356,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -359,12 +364,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -385,10 +387,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -397,6 +402,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -558,6 +564,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -565,10 +572,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -609,7 +618,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -647,9 +656,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/kcmkwin/Makefile.in +++ kdebase-3.5.6/kwin/kcmkwin/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kwin/kcmkwin/kwinrules/Makefile.in +++ kdebase-3.5.6/kwin/kcmkwin/kwinrules/Makefile.in @@ -188,6 +188,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -331,6 +332,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -381,6 +385,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -388,12 +393,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -414,10 +416,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -426,6 +431,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -587,6 +593,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -594,10 +601,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -657,7 +666,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -695,9 +704,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/kcmkwin/kwinoptions/Makefile.in +++ kdebase-3.5.6/kwin/kcmkwin/kwinoptions/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -605,7 +614,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -643,9 +652,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/web/Makefile.in +++ kdebase-3.5.6/kwin/clients/web/Makefile.in @@ -156,6 +156,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -299,6 +300,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -349,6 +353,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -356,12 +361,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -382,10 +384,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -394,6 +399,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -555,6 +561,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -562,10 +569,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -601,7 +610,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -639,9 +648,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/default/config/Makefile.in +++ kdebase-3.5.6/kwin/clients/default/config/Makefile.in @@ -149,6 +149,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -292,6 +293,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -342,6 +346,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -349,12 +354,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -375,10 +377,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -387,6 +392,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -548,6 +554,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -555,10 +562,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -592,7 +601,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -630,9 +639,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/default/Makefile.in +++ kdebase-3.5.6/kwin/clients/default/Makefile.in @@ -164,6 +164,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -307,6 +308,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -357,6 +361,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -364,12 +369,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -390,10 +392,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -402,6 +407,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -563,6 +569,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -570,10 +577,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -607,7 +616,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -645,9 +654,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/keramik/config/Makefile.in +++ kdebase-3.5.6/kwin/clients/keramik/config/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -597,7 +606,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -635,9 +644,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/keramik/Makefile.in +++ kdebase-3.5.6/kwin/clients/keramik/Makefile.in @@ -175,6 +175,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -318,6 +319,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -368,6 +372,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -375,12 +380,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -401,10 +403,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -413,6 +418,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -574,6 +580,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -581,10 +588,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -627,7 +636,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -665,9 +674,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/laptop/Makefile.in +++ kdebase-3.5.6/kwin/clients/laptop/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -596,7 +605,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -634,9 +643,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/plastik/config/Makefile.in +++ kdebase-3.5.6/kwin/clients/plastik/config/Makefile.in @@ -152,6 +152,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -295,6 +296,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -345,6 +349,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -352,12 +357,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -378,10 +380,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -390,6 +395,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -551,6 +557,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -558,10 +565,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/plastik/Makefile.in +++ kdebase-3.5.6/kwin/clients/plastik/Makefile.in @@ -169,6 +169,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -312,6 +313,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -362,6 +366,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -369,12 +374,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -395,10 +397,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -407,6 +412,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -568,6 +574,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -575,10 +582,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -616,7 +625,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -654,9 +663,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/Makefile.in +++ kdebase-3.5.6/kwin/clients/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kwin/clients/quartz/config/Makefile.in +++ kdebase-3.5.6/kwin/clients/quartz/config/Makefile.in @@ -149,6 +149,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -292,6 +293,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -342,6 +346,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -349,12 +354,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -375,10 +377,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -387,6 +392,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -548,6 +554,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -555,10 +562,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -592,7 +601,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -630,9 +639,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/quartz/Makefile.in +++ kdebase-3.5.6/kwin/clients/quartz/Makefile.in @@ -167,6 +167,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -310,6 +311,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -360,6 +364,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -367,12 +372,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -393,10 +395,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -405,6 +410,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -566,6 +572,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -573,10 +580,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -613,7 +622,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -651,9 +660,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/modernsystem/config/Makefile.in +++ kdebase-3.5.6/kwin/clients/modernsystem/config/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -593,7 +602,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -631,9 +640,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/modernsystem/Makefile.in +++ kdebase-3.5.6/kwin/clients/modernsystem/Makefile.in @@ -165,6 +165,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -308,6 +309,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -358,6 +362,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -365,12 +370,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -391,10 +393,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -403,6 +408,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -564,6 +570,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -571,10 +578,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -611,7 +620,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -649,9 +658,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/b2/config/Makefile.in +++ kdebase-3.5.6/kwin/clients/b2/config/Makefile.in @@ -149,6 +149,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -292,6 +293,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -342,6 +346,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -349,12 +354,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -375,10 +377,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -387,6 +392,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -548,6 +554,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -555,10 +562,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -592,7 +601,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -630,9 +639,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/b2/Makefile.in +++ kdebase-3.5.6/kwin/clients/b2/Makefile.in @@ -165,6 +165,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -308,6 +309,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -358,6 +362,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -365,12 +370,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -391,10 +393,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -403,6 +408,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -564,6 +570,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -571,10 +578,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -612,7 +621,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -650,9 +659,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/test/Makefile.in +++ kdebase-3.5.6/kwin/clients/test/Makefile.in @@ -151,6 +151,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -294,6 +295,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -344,6 +348,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -351,12 +356,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -377,10 +379,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -389,6 +394,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -550,6 +556,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -557,10 +564,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -596,7 +605,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -634,9 +643,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/redmond/Makefile.in +++ kdebase-3.5.6/kwin/clients/redmond/Makefile.in @@ -153,6 +153,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -296,6 +297,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -346,6 +350,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -353,12 +358,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -379,10 +381,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -391,6 +396,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -552,6 +558,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -559,10 +566,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -598,7 +607,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -636,9 +645,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/kwmtheme/cli_installer/Makefile.in +++ kdebase-3.5.6/kwin/clients/kwmtheme/cli_installer/Makefile.in @@ -141,6 +141,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -284,6 +285,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -334,6 +338,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -341,12 +346,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -367,10 +369,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -379,6 +384,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -540,6 +546,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -547,10 +554,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -589,7 +598,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -627,9 +636,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/clients/kwmtheme/Makefile.in +++ kdebase-3.5.6/kwin/clients/kwmtheme/Makefile.in @@ -165,6 +165,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -308,6 +309,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -358,6 +362,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -365,12 +370,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -391,10 +393,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -403,6 +408,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -564,6 +570,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -571,10 +578,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -610,7 +619,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -648,9 +657,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kwin/lib/Makefile.in +++ kdebase-3.5.6/kwin/lib/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -609,7 +618,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -647,9 +656,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kappfinder/Makefile.in +++ kdebase-3.5.6/kappfinder/Makefile.in @@ -180,6 +180,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -323,6 +324,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -373,6 +377,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -380,12 +385,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -406,10 +408,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -418,6 +423,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -579,6 +585,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -586,10 +593,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -626,7 +635,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -664,9 +673,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kappfinder/apps/Games/Arcade/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/Arcade/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -558,7 +567,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -596,9 +605,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Games/Board/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/Board/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Games/TacticStrategy/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/TacticStrategy/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Games/Roguelikes/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/Roguelikes/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -556,7 +565,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -594,9 +603,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Games/Card/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/Card/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Games/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -573,7 +582,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -611,9 +620,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Games/Toys/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/Toys/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Games/Emulators/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Games/Emulators/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Development/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Development/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -556,7 +565,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -594,9 +603,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -560,7 +569,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -598,9 +607,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Utilities/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Utilities/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -573,7 +582,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -611,9 +620,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Utilities/Editors/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Utilities/Editors/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Utilities/xutils/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Utilities/xutils/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Graphics/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Graphics/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -560,7 +569,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -598,9 +607,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Office/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Office/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -561,7 +570,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -599,9 +608,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/System/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/System/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -573,7 +582,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -611,9 +620,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/System/Terminal/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/System/Terminal/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Multimedia/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Multimedia/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -580,7 +589,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -618,9 +627,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Internet/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Internet/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -583,7 +592,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -621,9 +630,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kappfinder/apps/Internet/Terminal/Makefile.in +++ kdebase-3.5.6/kappfinder/apps/Internet/Terminal/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -557,7 +566,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -595,9 +604,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kxkb/pics/Makefile.in +++ kdebase-3.5.6/kxkb/pics/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -542,7 +551,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -580,9 +589,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kxkb/Makefile.in +++ kdebase-3.5.6/kxkb/Makefile.in @@ -197,6 +197,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -340,6 +341,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -390,6 +394,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -397,12 +402,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -423,10 +425,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -435,6 +440,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -596,6 +602,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -603,10 +610,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -671,7 +680,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -709,9 +718,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/configure.in +++ kdebase-3.5.6/configure.in @@ -42,6 +42,8 @@ dnl Automake doc recommends to do this only here. (Janos) AM_INIT_AUTOMAKE(kdebase, "3.5.6") dnl searches for some needed programs +AM_MAINTAINER_MODE + KDE_SET_PREFIX dnl generate the config header @@ -910,10 +912,10 @@ cat > Imakefile <<'EOF'[ acimake: - @echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\"" + @echo "XBINDIR=\"/usr/bin\" XLIBDIR=\"$(LIBDIR)\"" ]EOF - if $XMKMF >&5 2>&1 && test -f Makefile; then + if imake -I/usr/lib/X11/config -DTOPDIR=/etc/X11 -DCURDIR=. /etc/X11 >&5 2>&1 && test -f Makefile; then kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"` kde_cv_defines_imake_version=$imkv else --- kdebase-3.5.6.orig/konsole/doc/Makefile.in +++ kdebase-3.5.6/konsole/doc/Makefile.in @@ -123,6 +123,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -266,6 +267,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -316,6 +320,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -323,12 +328,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -349,10 +351,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -361,6 +366,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -522,6 +528,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -529,10 +536,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -559,7 +568,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -597,9 +606,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konsole/doc/VT100/Makefile.in +++ kdebase-3.5.6/konsole/doc/VT100/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -545,7 +554,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -583,9 +592,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konsole/Makefile.in +++ kdebase-3.5.6/konsole/Makefile.in @@ -150,6 +150,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -293,6 +294,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -343,6 +347,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -350,12 +355,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -376,10 +378,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -388,6 +393,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -549,6 +555,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -556,10 +563,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -600,7 +609,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -638,9 +647,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-updateSCRIPTS: $(update_SCRIPTS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/konsole/other/Makefile.in +++ kdebase-3.5.6/konsole/other/Makefile.in @@ -135,6 +135,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -278,6 +279,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -328,6 +332,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -335,12 +340,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -361,10 +363,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -373,6 +378,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -534,6 +540,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -541,10 +548,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -586,7 +595,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -624,9 +633,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konsole/other/wallpapers/Makefile.in +++ kdebase-3.5.6/konsole/other/wallpapers/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konsole/other/icons/Makefile.in +++ kdebase-3.5.6/konsole/other/icons/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konsole/fonts/Makefile.in +++ kdebase-3.5.6/konsole/fonts/Makefile.in @@ -117,6 +117,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -260,6 +261,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -310,6 +314,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -317,12 +322,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -343,10 +345,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -355,6 +360,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -516,6 +522,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -523,10 +530,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -554,7 +563,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -592,9 +601,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/konsole/konsole/Makefile.in +++ kdebase-3.5.6/konsole/konsole/Makefile.in @@ -213,6 +213,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -356,6 +357,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -406,6 +410,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -413,12 +418,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -439,10 +441,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -451,6 +456,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -612,6 +618,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -619,10 +626,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -727,7 +736,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -765,9 +774,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kate/utils/Makefile.in +++ kdebase-3.5.6/kate/utils/Makefile.in @@ -157,6 +157,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -300,6 +301,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -350,6 +354,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -357,12 +362,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -383,10 +385,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -395,6 +400,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -556,6 +562,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -563,10 +570,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kate/pics/actions/Makefile.in +++ kdebase-3.5.6/kate/pics/actions/Makefile.in @@ -107,6 +107,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -250,6 +251,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -300,6 +304,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -307,12 +312,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -333,10 +335,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -345,6 +350,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -506,6 +512,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -513,10 +520,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -543,7 +552,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -581,9 +590,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kate/pics/Makefile.in +++ kdebase-3.5.6/kate/pics/Makefile.in @@ -133,6 +133,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -276,6 +277,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -326,6 +330,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -333,12 +338,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -359,10 +361,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -371,6 +376,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -532,6 +538,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -539,10 +546,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -571,7 +580,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -609,9 +618,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kate/Makefile.in +++ kdebase-3.5.6/kate/Makefile.in @@ -125,6 +125,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -268,6 +269,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -318,6 +322,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -325,12 +330,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -351,10 +353,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -363,6 +368,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -524,6 +530,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -531,10 +538,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -561,7 +570,7 @@ all: docs-am all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -599,9 +608,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kate/data/Makefile.in +++ kdebase-3.5.6/kate/data/Makefile.in @@ -128,6 +128,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -271,6 +272,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -321,6 +325,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -328,12 +333,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -354,10 +356,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -366,6 +371,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -527,6 +533,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -534,10 +541,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -574,7 +583,7 @@ all: docs-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -612,9 +621,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: --- kdebase-3.5.6.orig/kate/interfaces/Makefile.in +++ kdebase-3.5.6/kate/interfaces/Makefile.in @@ -158,6 +158,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -301,6 +302,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -351,6 +355,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -358,12 +363,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -384,10 +386,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -396,6 +401,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -557,6 +563,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -564,10 +571,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -603,7 +612,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -641,9 +650,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstLTLIBRARIES: --- kdebase-3.5.6.orig/kate/app/Makefile.in +++ kdebase-3.5.6/kate/app/Makefile.in @@ -204,6 +204,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -347,6 +348,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -397,6 +401,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -404,12 +409,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -430,10 +432,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -442,6 +447,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -603,6 +609,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -610,10 +617,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -679,7 +688,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -717,9 +726,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kstart/Makefile.in +++ kdebase-3.5.6/kstart/Makefile.in @@ -146,6 +146,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -289,6 +290,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -339,6 +343,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -346,12 +351,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -372,10 +374,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -384,6 +389,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -545,6 +551,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -552,10 +559,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -589,7 +598,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -627,9 +636,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kdebugdialog/Makefile.in +++ kdebase-3.5.6/kdebugdialog/Makefile.in @@ -148,6 +148,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -291,6 +292,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -341,6 +345,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -348,12 +353,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -374,10 +376,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -386,6 +391,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -547,6 +553,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -554,10 +561,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -588,7 +597,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -626,9 +635,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) --- kdebase-3.5.6.orig/kreadconfig/Makefile.in +++ kdebase-3.5.6/kreadconfig/Makefile.in @@ -148,6 +148,7 @@ GLINC = @GLINC@ GLLIB = @GLLIB@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HALBACKEND = @HALBACKEND@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_INCS = @HAL_INCS@ @@ -291,6 +292,9 @@ LINUXCDPOLLING = @LINUXCDPOLLING@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -341,6 +345,7 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XTESTLIB = @XTESTLIB@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -348,12 +353,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -374,10 +376,13 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ have_xcursor_FALSE = @have_xcursor_FALSE@ have_xcursor_TRUE = @have_xcursor_TRUE@ @@ -386,6 +391,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_BZIP2_FALSE = @include_BZIP2_FALSE@ @@ -547,6 +553,7 @@ libexecdir = @libexecdir@ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -554,10 +561,12 @@ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ @@ -589,7 +598,7 @@ .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -627,9 +636,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL)
+ +diff -ur kdebase-orig/konqueror/konq_mainwindow.cc kdebase/konqueror/konq_mainwindow.cc +--- kdebase-orig/konqueror/konq_mainwindow.cc 2005-08-15 12:19:26.000000000 +0200 ++++ kdebase/konqueror/konq_mainwindow.cc 2005-08-16 11:06:28.000000000 +0200 +@@ -558,7 +558,7 @@ + + kdDebug(1202) << "trying openView for " << url << " (serviceType " << serviceType << ")" << endl; + if ( ( !serviceType.isEmpty() && serviceType != "application/octet-stream") || +- url.url() == "about:konqueror" || url.url() == "about:plugins" ) ++ url.url().startsWith("about:konqueror") || url.url() == "about:plugins" ) + { + KService::Ptr offer = KServiceTypeProfile::preferredService(serviceType, "Application"); + // If the associated app is konqueror itself, then make sure we try to embed before bailing out. +@@ -727,7 +727,7 @@ + + QString serviceName; // default: none provided + +- if ( url.url() == "about:konqueror" || url.url() == "about:plugins" ) ++ if ( url.url().startsWith("about:konqueror") || url.url() == "about:plugins" ) + { + serviceType = "KonqAboutPage"; // not KParts/ReadOnlyPart, it fills the Location menu ! :) + serviceName = "konq_aboutpage"; --- kdebase-3.5.6.orig/debian/patches/kubuntu_06_hide_home_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_06_hide_home_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/konqueror/Home.desktop-orig 2005-03-17 02:27:51.835213072 +0000 ++++ kdebase/konqueror/Home.desktop 2005-03-17 02:27:58.766159408 +0000 +@@ -151,3 +151,4 @@ + GenericName[zu]=Amafayela Omuntu siqu + Categories=Qt;KDE;Core; + OnlyShowIn=KDE; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/common/update.sh +++ kdebase-3.5.6/debian/patches/common/update.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +ADMIN="$1" + +test -d "$ADMIN" || { + echo >&2 "Error, admin dir '$ADMIN' does not exist." + exit 1 +} + +rm -rf a b +mkdir a b + +cp -a "$ADMIN" a/admin + +############################################################ +PATCH=03_libtool_update.diff +rm -rf b/admin; cp -a a/admin b + +cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in +cp -f /usr/share/libtool/ltmain.sh b/admin/ltmain.sh + +diff -Nrua a b >$PATCH +############################################################ + + +############################################################ +PATCH=02_autotools_update.diff +AUTOMAKE_DIR=/usr/share/automake-1.9 +rm -rf b/admin; cp -a a/admin b + +( cd b/admin + for file in *; do + case "$file" in + config.guess|config.sub) + continue + ;; + esac + if test -r "$AUTOMAKE_DIR/$file"; then + cp -f "$AUTOMAKE_DIR/$file" "$file" + fi + done +) + +diff -Nrua a b >$PATCH +############################################################ + +rm -rf a b --- kdebase-3.5.6.orig/debian/patches/common/04_am_maintainer_mode.diff +++ kdebase-3.5.6/debian/patches/common/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header --- kdebase-3.5.6.orig/debian/patches/common/kubuntu_01_kdepot.diff +++ kdebase-3.5.6/debian/patches/common/kubuntu_01_kdepot.diff @@ -0,0 +1,26 @@ +--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 ++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 +@@ -537,6 +537,8 @@ + if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi + export EXTRACTRC PREPARETIPS + ++kdepotpath=/usr/include/kde/kde.pot ++ + for subdir in $dirs; do + test -z "$VERBOSE" || echo "Making messages in $subdir" + (cd $subdir +@@ -554,10 +556,10 @@ + fi + perl -e '$mes=0; while () { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile + +- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- if ! test -f $kdepotpath; then +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- fi ++# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# if ! test -f $kdepotpath; then ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# fi + + $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ + XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages --- kdebase-3.5.6.orig/debian/patches/common/05_pedantic-errors.diff +++ kdebase-3.5.6/debian/patches/common/05_pedantic-errors.diff @@ -0,0 +1,12 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -2144,9 +2144,6 @@ + save_CXXFLAGS="$CXXFLAGS" + kde_safe_LIBS="$LIBS" + LIBS="$LIBS $X_EXTRA_LIBS" +-if test "$GXX" = "yes"; then +-CXXFLAGS="$CXXFLAGS -pedantic-errors" +-fi + AC_TRY_COMPILE([ + $2 + ], --- kdebase-3.5.6.orig/debian/patches/common/06_disable_no_undefined.diff +++ kdebase-3.5.6/debian/patches/common/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) --- kdebase-3.5.6.orig/debian/patches/common/README +++ kdebase-3.5.6/debian/patches/common/README @@ -0,0 +1,14 @@ +Common patches across KDE Debian packages +========================================= + + These directory should contain patches to the admin/ subdir of KDE + modules that are meant to be applied to all packaged modules. As the + admin/ subdir is shared across modules (and so, it's identical for all + modules at a certain version), I think it makes sense to have these + patches in a central location, and update them here. + + The script update.sh takes care of automatically updating the patches + that update autotools and libtool. You need to pass the location of an + admin/ directory as the first argument. + + -- Adeodato Simó, 2005-02-26 --- kdebase-3.5.6.orig/debian/patches/common/02_autotools_update.diff +++ kdebase-3.5.6/debian/patches/common/02_autotools_update.diff @@ -0,0 +1,355 @@ +diff -Nrua a/admin/install-sh b/admin/install-sh +--- a/admin/install-sh 2006-03-17 16:38:42.000000000 -0500 ++++ b/admin/install-sh 2006-03-24 19:22:40.000000000 -0500 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2005-11-07.23 ++scriptversion=2005-05-14.22 + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -58,21 +58,7 @@ + rmprog="${RMPROG-rm}" + mkdirprog="${MKDIRPROG-mkdir}" + +-posix_glob= +-posix_mkdir= +- +-# Symbolic mode for testing mkdir with directories. +-# It is the same as 755, but also tests that "u+" works. +-test_mode=u=rwx,g=rx,o=rx,u+wx +- +-# Desired mode of installed file. +-mode=0755 +- +-# Desired mode of newly created intermediate directories. +-# It is empty if not known yet. +-intermediate_mode= +- +-chmodcmd=$chmodprog ++chmodcmd="$chmodprog 0755" + chowncmd= + chgrpcmd= + stripcmd= +@@ -125,7 +111,7 @@ + + --help) echo "$usage"; exit $?;; + +- -m) mode=$2 ++ -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; +@@ -178,8 +164,6 @@ + exit 0 + fi + +-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15 +- + for src + do + # Protect names starting with `-'. +@@ -189,11 +173,15 @@ + + if test -n "$dir_arg"; then + dst=$src +- dstdir=$dst +- test -d "$dstdir" +- dstdir_status=$? +- else ++ src= + ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. +@@ -220,122 +208,53 @@ + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi +- dstdir=$dst +- dst=$dstdir/`basename "$src"` +- dstdir_status=0 +- else +- # Prefer dirname, but fall back on a substitute if dirname fails. +- dstdir=` +- (dirname "$dst") 2>/dev/null || +- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$dst" : 'X\(//\)[^/]' \| \ +- X"$dst" : 'X\(//\)$' \| \ +- X"$dst" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +- echo X"$dst" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q' +- ` +- +- test -d "$dstdir" +- dstdir_status=$? ++ dst=$dst/`basename "$src"` + fi + fi + +- obsolete_mkdir_used=false ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + +- if test $dstdir_status != 0; then +- case $posix_mkdir in +- '') +- posix_mkdir=false +- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then +- posix_mkdir=true +- else +- # Remove any dirs left behind by ancient mkdir implementations. +- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null +- fi ;; +- esac ++ # Make sure that the destination directory exists. + +- if +- $posix_mkdir && { ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" ++ ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS + +- # With -d, create the new directory with the user-specified mode. +- # Otherwise, create it using the same intermediate mode that +- # mkdir -p would use when creating intermediate directories. +- # POSIX says that this mode is "$(umask -S),u+wx", so use that +- # if umask -S works. +- +- if test -n "$dir_arg"; then +- mkdir_mode=$mode +- else +- case $intermediate_mode in +- '') +- if umask_S=`(umask -S) 2>/dev/null`; then +- intermediate_mode=$umask_S,u+wx +- else +- intermediate_mode=$test_mode +- fi ;; +- esac +- mkdir_mode=$intermediate_mode +- fi +- +- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir" +- } +- then : +- else ++ pathcomp= + +- # mkdir does not conform to POSIX, or it failed possibly due to +- # a race condition. Create the directory the slow way, step by +- # step, checking for races as we go. +- +- case $dstdir in +- /*) pathcomp=/ ;; +- -*) pathcomp=./ ;; +- *) pathcomp= ;; +- esac +- +- case $posix_glob in +- '') +- if (set -f) 2>/dev/null; then +- posix_glob=true +- else +- posix_glob=false +- fi ;; +- esac +- +- oIFS=$IFS +- IFS=/ +- $posix_glob && set -f +- set fnord $dstdir ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 + shift +- $posix_glob && set +f +- IFS=$oIFS +- +- for d +- do +- test "x$d" = x && continue +- +- pathcomp=$pathcomp$d +- if test ! -d "$pathcomp"; then +- $mkdirprog "$pathcomp" +- # Don't fail if two instances are running concurrently. +- test -d "$pathcomp" || exit 1 +- fi +- pathcomp=$pathcomp/ +- done +- obsolete_mkdir_used=true +- fi ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit ++ fi ++ pathcomp=$pathcomp/ ++ done + fi + + if test -n "$dir_arg"; then +- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && +- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && +- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || +- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1 ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ + else ++ dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ +@@ -343,6 +262,7 @@ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && +@@ -356,10 +276,10 @@ + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } && ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. +- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not +@@ -371,12 +291,11 @@ + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { +- if test -f "$dst"; then +- $doit $rmcmd -f "$dst" 2>/dev/null \ +- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ +- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { +- echo "$0: cannot unlink or rename $dst" >&2 ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else +@@ -385,14 +304,17 @@ + } && + + # Now rename the file to the real destination. +- $doit $mvcmd "$dsttmp" "$dst" ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } +- } || exit 1 +- +- trap '' 0 +- fi ++ } ++ fi || { (exit 1); exit 1; } + done + ++# The final little trick to "correctly" pass the exit status to the exit trap. ++{ ++ (exit 0); exit 0 ++} ++ + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" +diff -Nrua a/admin/missing b/admin/missing +--- a/admin/missing 2006-03-17 16:38:41.000000000 -0500 ++++ b/admin/missing 2006-03-24 19:22:40.000000000 -0500 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2004-09-07.08 ++scriptversion=2005-06-08.21 + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + +@@ -19,8 +19,8 @@ + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -87,12 +87,12 @@ + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + + Send bug reports to ." +- exit 0 ++ exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" +- exit 0 ++ exit $? + ;; + + -*) +@@ -288,11 +288,18 @@ + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." ++ # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then +- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` +- fi ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ++ fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 + touch $file + ;; + --- kdebase-3.5.6.orig/debian/patches/common/03_libtool_update.diff +++ kdebase-3.5.6/debian/patches/common/03_libtool_update.diff @@ -0,0 +1,7857 @@ +diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in +--- a/admin/libtool.m4.in 2006-03-17 16:38:41.000000000 -0500 ++++ b/admin/libtool.m4.in 2006-03-24 19:22:40.000000000 -0500 +@@ -1,28 +1,13 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +-## Copyright 1996, 1997, 1998, 1999, 2000, 2001 ++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 + ## Free Software Foundation, Inc. + ## Originally by Gordon Matzigkeit , 1996 + ## +-## This program is free software; you can redistribute it and/or modify +-## it under the terms of the GNU General Public License as published by +-## the Free Software Foundation; either version 2 of the License, or +-## (at your option) any later version. +-## +-## This program is distributed in the hope that it will be useful, but +-## WITHOUT ANY WARRANTY; without even the implied warranty of +-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-## General Public License for more details. +-## +-## You should have received a copy of the GNU General Public License +-## along with this program; if not, write to the Free Software +-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-## +-## As a special exception to the GNU General Public License, if you +-## distribute this file as part of a program that contains a +-## configuration script generated by Autoconf, you may include it under +-## the same distribution terms that you use for the rest of that program. ++## This file is free software; the Free Software Foundation gives ++## unlimited permission to copy and/or distribute it, with or without ++## modifications, as long as this notice is preserved. + +-# serial 47 AC_PROG_LIBTOOL ++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -82,7 +67,7 @@ + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' + AC_SUBST(LIBTOOL)dnl + + # Prevent multiple expansion +@@ -132,7 +117,7 @@ + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='sed -e s/^X//' ++Xsed='sed -e 1s/^X//' + [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + + # Same as above, but do not quote variable references. +@@ -152,7 +137,7 @@ + default_ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except M$VC, ++# All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a + ltmain="$ac_aux_dir/ltmain.sh" +@@ -172,6 +157,7 @@ + test -z "$AS" && AS=as + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS + test -z "$DLLTOOL" && DLLTOOL=dlltool + test -z "$LD" && LD=ld + test -z "$LN_S" && LN_S="ln -s" +@@ -191,15 +177,17 @@ + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + fi + ++_LT_CC_BASENAME([$compiler]) ++ + # Only perform the check for file, if the check method requires it + case $deplibs_check_method in + file_magic*) +@@ -240,11 +228,56 @@ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + ])# _LT_AC_SYS_COMPILER + + ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_COMPILER_BOILERPLATE ++ ++ ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++ + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- + # Links a minimal program and checks the executable +@@ -317,15 +350,15 @@ + + # The HP-UX ksh and POSIX shell print the target directory to stdout + # if CDPATH is set. +-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test -z "$ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string="`eval $cmd`") 2>/dev/null && +- echo_test_string="`eval $cmd`" && ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break +@@ -494,14 +527,13 @@ + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- case "`/usr/bin/file conftest.o`" in ++ case `/usr/bin/file conftest.o` in + *32-bit*) +- LINUX_64_MODE="32" + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +- ppc64-*linux*) ++ ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) +@@ -513,7 +545,6 @@ + esac + ;; + *64-bit*) +- LINUX_64_MODE="64" + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" +@@ -547,6 +578,22 @@ + CFLAGS="$SAVE_CFLAGS" + fi + ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) LD="${LD-ld} -64" ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + [*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) +@@ -578,7 +625,7 @@ + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +@@ -588,8 +635,10 @@ + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then ++ # So say no if there are warnings other than the usual output. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi +@@ -615,11 +664,16 @@ + LDFLAGS="$LDFLAGS $3" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The compiler can only warn and ignore the option if not recognized ++ # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi + else + $2=yes + fi +@@ -643,7 +697,7 @@ + AC_MSG_CHECKING([the maximum length of command line arguments]) + AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 +- testring="ABCD" ++ teststring="ABCD" + + case $build_os in + msdosdjgpp*) +@@ -672,20 +726,70 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- *) ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ +- = "XX$testring") >/dev/null 2>&1 && +- new_result=`expr "X$testring" : ".*" 2>&1` && ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` +- testring=$testring$testring ++ teststring=$teststring$teststring + done +- testring= ++ teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. +@@ -702,7 +806,7 @@ + + + # _LT_AC_CHECK_DLFCN +-# -------------------- ++# ------------------ + AC_DEFUN([_LT_AC_CHECK_DLFCN], + [AC_CHECK_HEADERS(dlfcn.h)dnl + ])# _LT_AC_CHECK_DLFCN +@@ -710,7 +814,7 @@ + + # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, + # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# ------------------------------------------------------------------ ++# --------------------------------------------------------------------- + AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], + [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl + if test "$cross_compiling" = yes; then : +@@ -776,17 +880,19 @@ + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } ++ else ++ puts (dlerror ()); + + exit (status); + }] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; +- x$lt_unknown|x*) $3 ;; ++ x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed +@@ -798,7 +904,7 @@ + + + # AC_LIBTOOL_DLOPEN_SELF +-# ------------------- ++# ---------------------- + AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], + [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl + if test "x$enable_dlopen" != xyes; then +@@ -835,7 +941,7 @@ + lt_cv_dlopen_self=yes + ]) + ;; +- ++ + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], +@@ -869,7 +975,7 @@ + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" +@@ -882,7 +988,7 @@ + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_AC_TRY_DLOPEN_SELF( +@@ -924,20 +1030,13 @@ + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + +- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers +- # that will create temporary files in the current directory regardless of +- # the output directory. Thus, making CWD read-only will cause this test +- # to fail, enabling locking or at least warning the user not to do parallel +- # builds. +- chmod -w . +- + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +@@ -949,13 +1048,18 @@ + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- if test ! -s out/conftest.err; then ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi +- chmod u+w . +- $rm conftest* out/* +- rmdir out ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* +@@ -1014,8 +1118,8 @@ + [AC_MSG_CHECKING([how to hardcode library paths into programs]) + _LT_AC_TAGVAR(hardcode_action, $1)= + if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +@@ -1072,7 +1176,7 @@ + *) + AC_MSG_RESULT([no]) + ;; +- esac ++ esac + fi + ])# AC_LIBTOOL_SYS_LIB_STRIP + +@@ -1085,7 +1189,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -1095,7 +1199,20 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++if test "$GCC" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -1160,7 +1277,7 @@ + amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + + beos*) +@@ -1169,7 +1286,7 @@ + shlibpath_var=LIBRARY_PATH + ;; + +-bsdi4*) ++bsdi[[45]]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1185,7 +1302,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -1197,7 +1314,8 @@ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname' ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' +@@ -1227,7 +1345,7 @@ + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; +@@ -1250,7 +1368,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -1273,20 +1391,17 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -1304,14 +1419,19 @@ + freebsd2*) + shlibpath_overrides_runpath=yes + ;; +- freebsd3.[01]* | freebsdelf3.[01]*) ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; ++ freebsd*) # from 4.6 on ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + esac + ;; + +@@ -1331,9 +1451,9 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -1348,7 +1468,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -1359,7 +1479,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -1371,6 +1491,18 @@ + postinstall_cmds='chmod 555 $lib' + ;; + ++interix3*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -1414,29 +1546,26 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- libsuff= +- if test "x$LINUX_64_MODE" = x64; then +- # Some platforms are per default 64-bit, so there's no /lib64 +- if test -d /lib64; then +- libsuff=64 +- fi +- fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi ++ + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, +@@ -1446,6 +1575,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -1455,7 +1596,7 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -1483,8 +1624,13 @@ + + openbsd*) + version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no +- need_version=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +@@ -1504,7 +1650,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -1522,13 +1668,6 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- + solaris*) + version_type=linux + need_lib_prefix=no +@@ -1554,7 +1693,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -1587,6 +1726,29 @@ + fi + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1600,6 +1762,11 @@ + esac + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi + ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + + +@@ -1624,6 +1791,9 @@ + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) + fi + fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. +@@ -1650,7 +1820,9 @@ + + case $tagname in + CXX) +- if test -n "$CXX" && test "X$CXX" != "Xno"; then ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then + AC_LIBTOOL_LANG_CXX_CONFIG + else + tagname="" +@@ -1712,7 +1884,7 @@ + + # AC_LIBTOOL_WIN32_DLL + # -------------------- +-# declare package support for building win32 dll's ++# declare package support for building win32 DLLs + AC_DEFUN([AC_LIBTOOL_WIN32_DLL], + [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) + ])# AC_LIBTOOL_WIN32_DLL +@@ -1750,7 +1922,7 @@ + + # AC_DISABLE_SHARED + # ----------------- +-#- set the default shared flag to --disable-shared ++# set the default shared flag to --disable-shared + AC_DEFUN([AC_DISABLE_SHARED], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_ENABLE_SHARED(no) +@@ -1886,7 +2058,7 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then +@@ -1996,7 +2168,7 @@ + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some GNU ld's only accept -v. ++ # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; +@@ -2141,7 +2314,7 @@ + + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file +- case "$host_cpu" in ++ case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so +@@ -2157,43 +2330,27 @@ + esac + ;; + ++interix3*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++ ;; ++ + irix5* | irix6* | nonstopux*) +- case $host_os in +- irix5* | nonstopux*) +- # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" +- ;; +- *) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" +- ;; ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; + esac +- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` + lt_cv_deplibs_check_method=pass_all + ;; + + # This must be Linux ELF. +-linux*) +- case $host_cpu in +- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* ) +- lt_cv_deplibs_check_method=pass_all ;; +- # the debian people say, arm and glibc 2.3.1 works for them with pass_all +- arm* ) +- lt_cv_deplibs_check_method=pass_all ;; +- *) +- # glibc up to 2.1.1 does not perform some relocations on ARM +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; +- esac +- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -2212,32 +2369,22 @@ + ;; + + openbsd*) +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + + osf3* | osf4* | osf5*) +- # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' +- lt_cv_file_magic_test_file=/shlib/libc.so +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-sco3.2v5*) + lt_cv_deplibs_check_method=pass_all + ;; + + solaris*) + lt_cv_deplibs_check_method=pass_all +- lt_cv_file_magic_test_file=/lib/libc.so + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' +@@ -2258,10 +2405,13 @@ + siemens) + lt_cv_deplibs_check_method=pass_all + ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + ;; + +-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + esac +@@ -2281,36 +2431,43 @@ + # Let the user override the test. + lt_cv_path_NM="$NM" + else +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/${ac_tool_prefix}nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac + ;; + esac +- esac +- fi ++ fi ++ done ++ IFS="$lt_save_ifs" + done +- IFS="$lt_save_ifs" + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi]) + NM="$lt_cv_path_NM" +@@ -2342,13 +2499,13 @@ + # ----------------------------------- + # sets LIBLTDL to the link flags for the libltdl convenience library and + # LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will +-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and +-# top_srcdir appropriately in the Makefiles. ++# --enable-ltdl-convenience to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++# (note the single quotes!). If your package is not flat and you're not ++# using automake, define top_builddir and top_srcdir appropriately in ++# the Makefiles. + AC_DEFUN([AC_LIBLTDL_CONVENIENCE], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + case $enable_ltdl_convenience in +@@ -2367,13 +2524,13 @@ + # ----------------------------------- + # sets LIBLTDL to the link flags for the libltdl installable library and + # LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +-# DIRECTORY is not provided and an installed libltdl is not found, it is +-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' +-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single +-# quotes!). If your package is not flat and you're not using automake, +-# define top_builddir and top_srcdir appropriately in the Makefiles. ++# --enable-ltdl-install to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# and an installed libltdl is not found, it is assumed to be `libltdl'. ++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++# '${top_srcdir}/' (note the single quotes!). If your package is not ++# flat and you're not using automake, define top_builddir and top_srcdir ++# appropriately in the Makefiles. + # In the future, this macro may have to be called after AC_PROG_LIBTOOL. + AC_DEFUN([AC_LIBLTDL_INSTALLABLE], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +@@ -2411,10 +2568,21 @@ + # --------------- + AC_DEFUN([_LT_AC_LANG_CXX], + [AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([AC_PROG_CXXCPP]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) + ])# _LT_AC_LANG_CXX + ++# _LT_AC_PROG_CXXCPP ++# ------------------ ++AC_DEFUN([_LT_AC_PROG_CXXCPP], ++[ ++AC_REQUIRE([AC_PROG_CXX]) ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++fi ++])# _LT_AC_PROG_CXXCPP + + # AC_LIBTOOL_F77 + # -------------- +@@ -2454,7 +2622,7 @@ + + + # AC_LIBTOOL_RC +-# -------------- ++# ------------- + # enable support for Windows resource files + AC_DEFUN([AC_LIBTOOL_RC], + [AC_REQUIRE([LT_AC_PROG_RC]) +@@ -2487,36 +2655,9 @@ + + _LT_AC_SYS_COMPILER + +-# +-# Check for any special shared library compilation flags. +-# +-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +-if test "$GCC" = no; then +- case $host_os in +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' +- ;; +- esac +-fi +-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then +- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) +- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : +- else +- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) +- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no +- fi +-fi +- +- +-# +-# Check to make sure the static flag actually works. +-# +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +- ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change +@@ -2530,9 +2671,9 @@ + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) ++AC_LIBTOOL_DLOPEN_SELF + +-# Report which librarie types wil actually be built ++# Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + +@@ -2541,7 +2682,7 @@ + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. +-case "$host_os" in ++case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then +@@ -2550,48 +2691,11 @@ + fi + ;; + +-aix4*) ++aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +- ;; +- darwin* | rhapsody*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ ;; + esac + AC_MSG_RESULT([$enable_shared]) + +@@ -2616,7 +2720,7 @@ + AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], + [AC_LANG_PUSH(C++) + AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([AC_PROG_CXXCPP]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)= +@@ -2628,6 +2732,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(hardcode_automatic, $1)=no + _LT_AC_TAGVAR(module_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= +@@ -2645,7 +2750,7 @@ + _LT_AC_TAGVAR(compiler_lib_search_path, $1)= + + # Source file extension for C++ test sources. +-ac_ext=cc ++ac_ext=cpp + + # Object file extension for compiled C++ test sources. + objext=o +@@ -2655,11 +2760,15 @@ + lt_simple_compile_test_code="int some_variable = 0;\n" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' ++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD +@@ -2670,18 +2779,18 @@ + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else +- unset lt_cv_prog_gnu_ld ++ $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else +- unset lt_cv_path_LD ++ $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` ++_LT_CC_BASENAME([$compiler]) + + # We don't want -fno-exception wen compiling C++ code, so set the + # no_builtin_flag separately +@@ -2699,8 +2808,8 @@ + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -2726,7 +2835,7 @@ + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists +@@ -2756,8 +2865,23 @@ + exp_sym_flag='-Bexport' + no_entry_flag="" + else +- # KDE requires run time linking. Make it the default. +- aix_use_runtimelinking=yes ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi +@@ -2774,7 +2898,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GXX" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` +@@ -2793,8 +2917,12 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi ++ ;; + esac + shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -2803,15 +2931,16 @@ + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then +- shared_flag='-qmkshrobj ${wl}-G' ++ shared_flag='${wl}-G' + else +- shared_flag='-qmkshrobj' ++ shared_flag='${wl}-bM:SRE' + fi + fi + fi + +- # Let the compiler handle the export list. +- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. +@@ -2820,13 +2949,12 @@ + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX +@@ -2835,16 +2963,26 @@ + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes + # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ + chorus*) + case $cc_basename in + *) +@@ -2858,12 +2996,12 @@ + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -2872,70 +3010,81 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +- darwin* | rhapsody*) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' +- +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ if test "$GXX" = yes ; then ++ lt_int_apple_cc_single_mod=no ++ output_verbose_link_cmd='echo' ++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++ lt_int_apple_cc_single_mod=yes ++ fi ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ fi ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; + + dgux*) + case $cc_basename in +- ec++) ++ ec++*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- ghcx) ++ ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -2946,14 +3095,14 @@ + ;; + esac + ;; +- freebsd[12]*) ++ freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before switch to ELF + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_AC_TAGVAR(ld_shlibs, $1)=yes +@@ -2970,12 +3119,12 @@ + # location of the library. + + case $cc_basename in +- CC) ++ CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aCC) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ aCC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -2984,11 +3133,11 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -2998,33 +3147,22 @@ + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + *) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- ia64*) ++ case $host_cpu in ++ hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. + ;; + *) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes +@@ -3035,17 +3173,20 @@ + esac + + case $cc_basename in +- CC) ++ CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aCC) +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists +@@ -3061,12 +3202,15 @@ + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then +- case "$host_cpu" in +- ia64*|hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -3077,11 +3221,25 @@ + ;; + esac + ;; ++ interix3*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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' ++ ;; + irix5* | irix6*) + case $cc_basename in +- CC) ++ CC*) + # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is +@@ -3092,9 +3250,9 @@ + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + fi + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +@@ -3103,16 +3261,16 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in +- KCC) ++ KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -3130,20 +3288,44 @@ + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; +- icpc) ++ icpc*) + # Intel C++ + with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- cxx) ++ pgCC*) ++ # Portland Group C++ compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) + # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -3171,7 +3353,7 @@ + ;; + mvs*) + case $cc_basename in +- cxx) ++ cxx*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +@@ -3181,7 +3363,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -3192,15 +3374,31 @@ + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ ;; + osf3*) + case $cc_basename in +- KCC) ++ KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3210,14 +3408,14 @@ + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- cxx) ++ cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3235,7 +3433,7 @@ + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3254,13 +3452,13 @@ + ;; + osf4* | osf5*) + case $cc_basename in +- KCC) ++ KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3269,17 +3467,17 @@ + # the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- cxx) ++ cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -3298,7 +3496,7 @@ + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3319,27 +3517,14 @@ + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- sco*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; + sunos4*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- lcc) ++ lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -3352,36 +3537,33 @@ + ;; + solaris*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The C++ compiler is used as linker so we must use $wl + # flag to pass the commands to the underlying system +- # linker. ++ # linker. We must also pass each convience library through ++ # to the system linker between allextract/defaultextract. ++ # The C++ compiler will combine linker options so we ++ # cannot just pass the convience library names through ++ # without $wl. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is +@@ -3389,9 +3571,9 @@ + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; +- gcx) ++ gcx*) + # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +@@ -3401,9 +3583,9 @@ + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -3412,9 +3594,9 @@ + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -3427,12 +3609,63 @@ + ;; + esac + ;; +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # names for shared libraries. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + ;; + tandem*) + case $cc_basename in +- NCC) ++ NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -3469,8 +3702,6 @@ + AC_LIBTOOL_PROG_LD_SHLIBS($1) + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) + + AC_LIBTOOL_CONFIG($1) + +@@ -3488,7 +3719,7 @@ + ])# AC_LIBTOOL_LANG_CXX_CONFIG + + # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------ ++# ------------------------------------ + # Figure out "hidden" library dependencies from verbose + # compiler output when linking a shared library. + # Parse the compiler output and extract the necessary +@@ -3542,7 +3773,7 @@ + # The `*' in the case matches for architectures that use `case' in + # $output_verbose_cmd can trigger glob expansion during the loop + # eval without this substitution. +- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" ++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + + for p in `eval $output_verbose_link_cmd`; do + case $p in +@@ -3582,7 +3813,7 @@ + fi + ;; + +- *.$objext|*.$libext) ++ *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then +@@ -3618,13 +3849,37 @@ + + $rm -f confest.$objext + ++# PORTME: override above test on systems where it is broken ++ifelse([$1],[CXX], ++[case $host_os in ++interix3*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ _LT_AC_TAGVAR(predep_objects,$1)= ++ _LT_AC_TAGVAR(postdep_objects,$1)= ++ _LT_AC_TAGVAR(postdeps,$1)= ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC*) ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' ++ ;; ++ esac ++ ;; ++esac ++]) ++ + case " $_LT_AC_TAGVAR(postdeps, $1) " in + *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; + esac + ])# AC_LIBTOOL_POSTDEP_PREDEP + + # AC_LIBTOOL_LANG_F77_CONFIG +-# ------------------------ ++# -------------------------- + # Ensure that the configuration vars for the C compiler are + # suitably defined. Those variables are subsequently used by + # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +@@ -3668,12 +3923,16 @@ + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + CC=${F77-"f77"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` ++_LT_CC_BASENAME([$compiler]) + + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) +@@ -3683,7 +3942,7 @@ + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. +-case "$host_os" in ++case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then +@@ -3691,8 +3950,10 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4*) +- test "$enable_shared" = yes && enable_static=no ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) +@@ -3702,8 +3963,6 @@ + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- + _LT_AC_TAGVAR(GCC, $1)="$G77" + _LT_AC_TAGVAR(LD, $1)="$LD" + +@@ -3713,8 +3972,6 @@ + AC_LIBTOOL_PROG_LD_SHLIBS($1) + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +- + + AC_LIBTOOL_CONFIG($1) + +@@ -3743,20 +4000,27 @@ + lt_simple_compile_test_code="class foo {}\n" + + # Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + CC=${GCJ-"gcj"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + + # GCJ did not exist at the time GCC didn't implicitly link libc in. + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly +@@ -3768,8 +4032,6 @@ + AC_LIBTOOL_PROG_LD_SHLIBS($1) + AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) + + AC_LIBTOOL_CONFIG($1) + +@@ -3779,7 +4041,7 @@ + + + # AC_LIBTOOL_LANG_RC_CONFIG +-# -------------------------- ++# ------------------------- + # Ensure that the configuration vars for the Windows resource compiler are + # suitably defined. Those variables are subsequently used by + # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +@@ -3803,11 +4065,16 @@ + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_AC_SYS_COMPILER + ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + CC=${RC-"windres"} + compiler=$CC + _LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + + AC_LIBTOOL_CONFIG($1) +@@ -3833,11 +4100,12 @@ + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +- fi ++ fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ +@@ -3887,7 +4155,7 @@ + _LT_AC_TAGVAR(archive_cmds, $1) | \ + _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ + _LT_AC_TAGVAR(module_cmds, $1) | \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ + _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ +@@ -3953,11 +4221,11 @@ + SED=$lt_SED + + # Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e s/^X//" ++Xsed="$SED -e 1s/^X//" + + # The HP-UX ksh and POSIX shell print the target directory to stdout + # if CDPATH is set. +-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + # The names of the tagged configurations supported by this script. + available_tags= +@@ -3988,6 +4256,12 @@ + # The host system. + host_alias=$host_alias + host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os + + # An echo program that does not interpret backslashes. + echo=$lt_echo +@@ -3999,6 +4273,9 @@ + # A C compiler. + LTCC=$lt_LTCC + ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ + # A language-specific compiler. + CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + +@@ -4018,7 +4295,7 @@ + NM=$lt_NM + + # A symbol stripping program +-STRIP=$STRIP ++STRIP=$lt_STRIP + + # Used to examine libraries when file_magic_cmd begins "file" + MAGIC_CMD=$MAGIC_CMD +@@ -4049,7 +4326,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -4064,7 +4341,7 @@ + # Does compiler simultaneously support -c and -o options? + compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + +-# Must we lock files when doing compilation ? ++# Must we lock files when doing compilation? + need_locks=$lt_need_locks + + # Do we need the lib prefix for modules? +@@ -4293,7 +4570,10 @@ + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. +- test -f Makefile && make "$ltmain" ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi + fi + ])# AC_LIBTOOL_CONFIG + +@@ -4335,9 +4615,6 @@ + # Regexp to match symbols that can be accessed directly from C. + sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +-# Transform the above into a raw symbol and a C symbol. +-symxfrm='\1 \2\3 \3' +- + # Transform an extracted symbol line into a proper C declaration + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +@@ -4359,14 +4636,30 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + 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'" + ;; ++linux* | k*bsd*-gnu) ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDGIRSTW]]' ++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ 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'" ++ fi ++ ;; + irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; + osf*) + symcode='[[BCDEGQRST]]' + ;; +-solaris* | sysv5*) +- symcode='[[BDT]]' ++solaris*) ++ symcode='[[BDRT]]' ++ ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' + ;; + sysv4) + symcode='[[DFNSTU]]' +@@ -4384,14 +4677,17 @@ + # If we're using GNU nm, then use its standard symbol codes. + case `$NM -V 2>&1` in + *GNU* | *'with BFD'*) +- symcode='[[ABCDGISTW]]' ;; ++ symcode='[[ABCDGIRSTW]]' ;; + esac + + # Try without a prefix undercore, then with it. + for ac_symprfx in "" "_"; do + ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ + # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -4547,6 +4843,10 @@ + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +@@ -4555,7 +4855,7 @@ + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + ;; + *) +@@ -4580,18 +4880,28 @@ + ;; + chorus*) + case $cc_basename in +- cxch68) ++ cxch68*) + # Green Hills C++ Compiler + # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; + dgux*) + case $cc_basename in +- ec++) ++ ec++*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; +- ghcx) ++ ghcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +@@ -4599,22 +4909,22 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in +- CC) ++ CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; +- aCC) ++ aCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" +- case "$host_cpu" in ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -4627,9 +4937,13 @@ + ;; + esac + ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in +- CC) ++ CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. +@@ -4638,20 +4952,26 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in +- KCC) ++ KCC*) + # KAI C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +- icpc) ++ icpc* | ecpc*) + # Intel C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- cxx) ++ ;; ++ pgCC*) ++ # Portland Group C++ compiler. ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. +@@ -4668,25 +4988,25 @@ + ;; + mvs*) + case $cc_basename in +- cxx) ++ cxx*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +- KCC) ++ KCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +- cxx) ++ cxx*) + # Digital/Compaq C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha +@@ -4700,24 +5020,15 @@ + ;; + psos*) + ;; +- sco*) +- case $cc_basename in +- CC) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- *) +- ;; +- esac +- ;; + solaris*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; +- gcx) ++ gcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; +@@ -4727,12 +5038,12 @@ + ;; + sunos4*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.x + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; +- lcc) ++ lcc*) + # Lucid + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +@@ -4742,7 +5053,7 @@ + ;; + tandem*) + case $cc_basename in +- NCC) ++ NCC*) + # NonStop-UX NCC 3.20 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; +@@ -4750,7 +5061,14 @@ + ;; + esac + ;; +- unixware*) ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac + ;; + vxworks*) + ;; +@@ -4797,6 +5115,11 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + ++ interix3*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -4813,7 +5136,7 @@ + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -4839,6 +5162,16 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being +@@ -4850,7 +5183,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -4873,13 +5206,20 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- linux*) +- case $CC in ++ linux* | k*bsd*-gnu) ++ case $cc_basename in + icc* | ecc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + ccc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. +@@ -4894,15 +5234,15 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' +- ;; +- + solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac + ;; + + sunos4*) +@@ -4911,7 +5251,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4924,6 +5264,17 @@ + fi + ;; + ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ unicos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ + uts4*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -4951,7 +5302,7 @@ + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) + fi +-case "$host_os" in ++case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +@@ -4960,6 +5311,16 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" + ;; + esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) + ]) + + +@@ -4984,7 +5345,10 @@ + _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +@@ -5010,7 +5374,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown + _LT_AC_TAGVAR(hardcode_automatic, $1)=no + _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* +@@ -5027,7 +5391,8 @@ + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= +- ++ # Just being paranoid about ensuring that cc_basename is set. ++ _LT_CC_BASENAME([$compiler]) + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time +@@ -5037,6 +5402,10 @@ + with_gnu_ld=no + fi + ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; + openbsd*) + with_gnu_ld=no + ;; +@@ -5047,6 +5416,27 @@ + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) +@@ -5084,7 +5474,7 @@ + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi +@@ -5094,13 +5484,13 @@ + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -5109,23 +5499,70 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix3*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ tmp_addflag= ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test $supports_anon_versioning = yes; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ $echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else +- ld_shlibs=no ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +- solaris* | sysv5*) ++ solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 +@@ -5139,13 +5576,40 @@ + + EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ + sunos4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +@@ -5155,24 +5619,19 @@ + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi ++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) +@@ -5184,7 +5643,7 @@ + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +@@ -5206,9 +5665,21 @@ + else + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac + +- # KDE requires run time linking. Make it the default. +- aix_use_runtimelinking=yes + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi +@@ -5225,7 +5696,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GCC" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` +@@ -5244,8 +5715,12 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi ++ ;; + esac + shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -5253,30 +5728,30 @@ + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='-qmkshrobj ${wl}-G' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' + else +- shared_flag='-qmkshrobj' +- fi ++ shared_flag='${wl}-bM:SRE' ++ fi + fi + fi + +- # Let the compiler handle the export list. +- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX +@@ -5285,13 +5760,11 @@ + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes + # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; +@@ -5304,7 +5777,7 @@ + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + +- bsdi4*) ++ bsdi[[45]]*) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +@@ -5314,69 +5787,69 @@ + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' ++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) +- if test "$GXX" = yes ; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' +- ;; +- esac +- fi +- ;; ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; + esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi + ;; + + dgux*) +@@ -5409,8 +5882,8 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' ++ freebsd* | dragonfly*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -5418,7 +5891,7 @@ + + hpux9*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -5432,47 +5905,62 @@ + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + +- hpux10* | hpux11*) ++ hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- ;; + *) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +@@ -5486,7 +5974,7 @@ + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +@@ -5496,7 +5984,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -5519,7 +6007,8 @@ + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else +@@ -5529,7 +6018,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac +@@ -5540,14 +6029,14 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +@@ -5559,13 +6048,13 @@ + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -5573,21 +6062,15 @@ + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + +- sco3.2v5*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- + solaris*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ wlarc='${wl}' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else ++ wlarc='' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +@@ -5596,8 +6079,18 @@ + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++ *) ++ # The compiler driver will combine linker options so we ++ # cannot just pass the convience library names through ++ # without $wl, iff we do not link with $LD. ++ # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ case $wlarc in ++ '') ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++ *) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; ++ esac ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; +@@ -5606,7 +6099,7 @@ + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -5654,36 +6147,45 @@ + fi + ;; + +- sysv4.2uw2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; ++ runpath_var='LD_RUN_PATH' + +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- sysv5*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + + uts4*) +@@ -5701,11 +6203,6 @@ + AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) + test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +- + # + # Do we need to explicitly link libc? + # +@@ -5726,13 +6223,14 @@ + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- ++ + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= +@@ -5860,7 +6358,7 @@ + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && break ++ test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in +diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh +--- a/admin/ltmain.sh 2006-03-17 16:38:41.000000000 -0500 ++++ b/admin/ltmain.sh 2006-03-24 19:22:40.000000000 -0500 +@@ -1,7 +1,7 @@ + # ltmain.sh - Provide generalized library-building support services. + # NOTE: Changing this file will not affect anything until you rerun configure. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # +@@ -24,6 +24,34 @@ + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++basename="s,^.*/,,g" ++ ++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh ++# is ksh but when the shell is invoked as "sh" and the current value of ++# the _XPG environment variable is not equal to 1 (one), the special ++# positional parameter $0, within a function call, is the name of the ++# function. ++progpath="$0" ++ ++# The name of this program: ++progname=`echo "$progpath" | $SED $basename` ++modename="$progname" ++ ++# Global variables: ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 ++ ++PROGRAM=ltmain.sh ++PACKAGE=libtool ++VERSION="1.5.22 Debian 1.5.22-4" ++TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" ++ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes. ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ + # Check that we have a working $echo. + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. +@@ -36,7 +64,7 @@ + : + else + # Restart under the correct shell, and then maybe $echo will work. +- exec $SHELL "$0" --no-reexec ${1+"$@"} ++ exec $SHELL "$progpath" --no-reexec ${1+"$@"} + fi + + if test "X$1" = X--fallback-echo; then +@@ -45,19 +73,9 @@ + cat <&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Global variables. +@@ -111,6 +132,8 @@ + show="$echo" + show_help= + execute_dlfiles= ++duplicate_deps=no ++preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" + +@@ -118,10 +141,51 @@ + # Shell function definitions: + # This seems to be the best place for them + ++# func_mktempdir [string] ++# Make a temporary directory that won't clash with other running ++# libtool processes, and avoids race conditions if possible. If ++# given, STRING is the basename for that directory. ++func_mktempdir () ++{ ++ my_template="${TMPDIR-/tmp}/${1-$progname}" ++ ++ if test "$run" = ":"; then ++ # Return a directory name, but don't create it in dry-run mode ++ my_tmpdir="${my_template}-$$" ++ else ++ ++ # If mktemp works, use that first and foremost ++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` ++ ++ if test ! -d "$my_tmpdir"; then ++ # Failing that, at least try and use $RANDOM to avoid a race ++ my_tmpdir="${my_template}-${RANDOM-0}$$" ++ ++ save_mktempdir_umask=`umask` ++ umask 0077 ++ $mkdir "$my_tmpdir" ++ umask $save_mktempdir_umask ++ fi ++ ++ # If we're not in dry-run mode, bomb out on failure ++ test -d "$my_tmpdir" || { ++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 ++ exit $EXIT_FAILURE ++ } ++ fi ++ ++ $echo "X$my_tmpdir" | $Xsed ++} ++ ++ ++# func_win32_libid arg ++# return the library type of file 'arg' ++# + # Need a lot of goo to handle *both* DLLs and import libs + # Has to be a shell function in order to 'eat' the argument + # that is supplied when $file_magic_command is called. +-win32_libid () { ++func_win32_libid () ++{ + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in +@@ -130,17 +194,16 @@ + ;; + *ar\ archive*) # could be an import, or static + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ +- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then ++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | \ +- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` +- if test "X$win32_nmres" = "Ximport" ; then +- win32_libid_type="x86 archive import" +- else +- win32_libid_type="x86 archive static" +- fi ++ $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` ++ case $win32_nmres in ++ import*) win32_libid_type="x86 archive import";; ++ *) win32_libid_type="x86 archive static";; ++ esac + fi + ;; +- *DLL*) ++ *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... +@@ -154,9 +217,181 @@ + $echo $win32_libid_type + } + ++ ++# func_infer_tag arg ++# Infer tagged configuration to use if any are available and ++# if one wasn't chosen via the "--tag" command line option. ++# Only attempt this if the compiler in the base compile ++# command doesn't match the default compiler. ++# arg is usually of the form 'gcc ...' ++func_infer_tag () ++{ ++ if test -n "$available_tags" && test -z "$tagname"; then ++ CC_quoted= ++ for arg in $CC; do ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case $@ in ++ # Blanks in the command may have been stripped by the calling shell, ++ # but not from the CC environment variable when configure was run. ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; ++ # Blanks at the start of $base_compile will cause this to fail ++ # if we don't check for them as well. ++ *) ++ for z in $available_tags; do ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ # Evaluate the configuration. ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ CC_quoted= ++ for arg in $CC; do ++ # Double-quote args containing other shell metacharacters. ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case "$@ " in ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ++ # The compiler in the base compile command matches ++ # the one in the tagged configuration. ++ # Assume this is the tagged configuration we want. ++ tagname=$z ++ break ++ ;; ++ esac ++ fi ++ done ++ # If $tagname still isn't set, then no tagged configuration ++ # was found and let the user know that the "--tag" command ++ # line option must be used. ++ if test -z "$tagname"; then ++ $echo "$modename: unable to infer tagged configuration" ++ $echo "$modename: specify a tag with \`--tag'" 1>&2 ++ exit $EXIT_FAILURE ++# else ++# $echo "$modename: using $tagname tagged configuration" ++ fi ++ ;; ++ esac ++ fi ++} ++ ++ ++# func_extract_an_archive dir oldlib ++func_extract_an_archive () ++{ ++ f_ex_an_ar_dir="$1"; shift ++ f_ex_an_ar_oldlib="$1" ++ ++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" ++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? ++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++} ++ ++# func_extract_archives gentop oldlib ... ++func_extract_archives () ++{ ++ my_gentop="$1"; shift ++ my_oldlibs=${1+"$@"} ++ my_oldobjs="" ++ my_xlib="" ++ my_xabs="" ++ my_xdir="" ++ my_status="" ++ ++ $show "${rm}r $my_gentop" ++ $run ${rm}r "$my_gentop" ++ $show "$mkdir $my_gentop" ++ $run $mkdir "$my_gentop" ++ my_status=$? ++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then ++ exit $my_status ++ fi ++ ++ for my_xlib in $my_oldlibs; do ++ # Extract the objects. ++ case $my_xlib in ++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; ++ *) my_xabs=`pwd`"/$my_xlib" ;; ++ esac ++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` ++ my_xdir="$my_gentop/$my_xlib" ++ ++ $show "${rm}r $my_xdir" ++ $run ${rm}r "$my_xdir" ++ $show "$mkdir $my_xdir" ++ $run $mkdir "$my_xdir" ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then ++ exit $exit_status ++ fi ++ case $host in ++ *-darwin*) ++ $show "Extracting $my_xabs" ++ # Do not bother doing anything if just a dry run ++ if test -z "$run"; then ++ darwin_orig_dir=`pwd` ++ cd $my_xdir || exit $? ++ darwin_archive=$my_xabs ++ darwin_curdir=`pwd` ++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` ++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` ++ if test -n "$darwin_arches"; then ++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` ++ darwin_arch= ++ $show "$darwin_base_archive has multiple architectures $darwin_arches" ++ for darwin_arch in $darwin_arches ; do ++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" ++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ func_extract_an_archive "`pwd`" "${darwin_base_archive}" ++ cd "$darwin_curdir" ++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" ++ done # $darwin_arches ++ ## Okay now we have a bunch of thin objects, gotta fatten them up :) ++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` ++ darwin_file= ++ darwin_files= ++ for darwin_file in $darwin_filelist; do ++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ lipo -create -output "$darwin_file" $darwin_files ++ done # $darwin_filelist ++ ${rm}r unfat-$$ ++ cd "$darwin_orig_dir" ++ else ++ cd "$darwin_orig_dir" ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ fi # $darwin_arches ++ fi # $run ++ ;; ++ *) ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ ;; ++ esac ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ done ++ func_extract_archives_result="$my_oldobjs" ++} + # End of Shell function definitions + ##################################### + ++# Darwin sucks ++eval std_shrext=\"$shrext_cmds\" ++ ++disable_libs=no ++ + # Parse our command line options once, thoroughly. + while test "$#" -gt 0 + do +@@ -176,12 +411,13 @@ + ;; + tag) + tagname="$arg" ++ preserve_args="${preserve_args}=$arg" + + # Check whether tagname contains only valid characters + case $tagname in + *[!-_A-Za-z0-9,/]*) + $echo "$progname: invalid tag name: $tagname" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -191,10 +427,10 @@ + # not specially marked. + ;; + *) +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then + taglist="$taglist $tagname" + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" + else + $echo "$progname: ignoring unknown tag $tagname" 1>&2 + fi +@@ -220,24 +456,25 @@ + --version) + $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" + $echo +- $echo "Copyright (C) 2003 Free Software Foundation, Inc." ++ $echo "Copyright (C) 2005 Free Software Foundation, Inc." + $echo "This is free software; see the source for copying conditions. There is NO" + $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +- exit 0 ++ exit $? + ;; + + --config) +- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 ++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath + # Now print the configurations for the tags. + for tagname in $taglist; do +- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" ++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + done +- exit 0 ++ exit $? + ;; + + --debug) + $echo "$progname: enabling shell trace mode" + set -x ++ preserve_args="$preserve_args $arg" + ;; + + --dry-run | -n) +@@ -256,7 +493,7 @@ + else + $echo "disable static libraries" + fi +- exit 0 ++ exit $? + ;; + + --finish) mode="finish" ;; +@@ -268,13 +505,19 @@ + + --quiet | --silent) + show=: ++ preserve_args="$preserve_args $arg" + ;; + +- --tag) prevopt="--tag" prev=tag ;; ++ --tag) ++ prevopt="--tag" ++ prev=tag ++ preserve_args="$preserve_args --tag" ++ ;; + --tag=*) + set tag "$optarg" ${1+"$@"} + shift + prev=tag ++ preserve_args="$preserve_args --tag" + ;; + + -dlopen) +@@ -285,7 +528,7 @@ + -*) + $echo "$modename: unrecognized option \`$arg'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + + *) +@@ -298,9 +541,21 @@ + if test -n "$prevopt"; then + $echo "$modename: option \`$prevopt' requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + ++case $disable_libs in ++no) ++ ;; ++shared) ++ build_libtool_libs=no ++ build_old_libs=yes ++ ;; ++static) ++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` ++ ;; ++esac ++ + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. +@@ -311,7 +566,7 @@ + # Infer the operation mode. + if test -z "$mode"; then + $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 +- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 ++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 + case $nonopt in + *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) + mode=link +@@ -354,7 +609,7 @@ + if test -n "$execute_dlfiles" && test "$mode" != execute; then + $echo "$modename: unrecognized option \`-dlopen'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. +@@ -369,13 +624,15 @@ + # Get the compilation command and the source file. + base_compile= + srcfile="$nonopt" # always keep a non-empty value in "srcfile" ++ suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= ++ later= + + for arg + do +- case "$arg_mode" in ++ case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" +@@ -394,24 +651,19 @@ + -o) + if test -n "$libobj" ; then + $echo "$modename: you cannot specify \`-o' more than once" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + arg_mode=target + continue + ;; + +- -static) +- build_old_libs=yes ++ -static | -prefer-pic | -prefer-non-pic) ++ later="$later $arg" + continue + ;; + +- -prefer-pic) +- pic_mode=yes +- continue +- ;; +- +- -prefer-non-pic) +- pic_mode=no ++ -no-suppress) ++ suppress_opt=no + continue + ;; + +@@ -424,7 +676,7 @@ + args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` + lastarg= + save_ifs="$IFS"; IFS=',' +- for arg in $args; do ++ for arg in $args; do + IFS="$save_ifs" + + # Double-quote args containing other shell metacharacters. +@@ -462,7 +714,10 @@ + case $lastarg in + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. ++ # in scan sets, and some SunOS ksh mistreat backslash-escaping ++ # in scan sets (worked around with variable expansion), ++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets ++ # at all, so we specify them separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + lastarg="\"$lastarg\"" + ;; +@@ -474,11 +729,11 @@ + case $arg_mode in + arg) + $echo "$modename: you must specify an argument for -Xcompile" +- exit 1 ++ exit $EXIT_FAILURE + ;; + target) + $echo "$modename: you must specify a target with \`-o'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + *) + # Get the name of the library object. +@@ -511,51 +766,39 @@ + *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *) + $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base compile +- # command doesn't match the default compiler. +- if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case "$base_compile " in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) +- # The compiler in the base compile command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi ++ func_infer_tag $base_compile ++ ++ for arg in $later; do ++ case $arg in ++ -static) ++ build_old_libs=yes ++ continue ++ ;; ++ ++ -prefer-pic) ++ pic_mode=yes ++ continue ++ ;; ++ ++ -prefer-non-pic) ++ pic_mode=no ++ continue + ;; + esac +- fi ++ done + ++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` ++ case $qlibobj in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ qlibobj="\"$qlibobj\"" ;; ++ esac ++ test "X$libobj" != "X$qlibobj" \ ++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ ++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." + objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then +@@ -568,7 +811,7 @@ + if test -z "$base_compile"; then + $echo "$modename: you must specify a compilation command" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Delete any leftover library objects. +@@ -579,7 +822,7 @@ + fi + + $run $rm $removelist +- trap "$run $rm $removelist; exit 1" 1 2 15 ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +@@ -598,7 +841,7 @@ + output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" + removelist="$removelist $output_obj $lockfile" +- trap "$run $rm $removelist; exit 1" 1 2 15 ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + else + output_obj= + need_locks=no +@@ -608,7 +851,7 @@ + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then +- until $run ln "$0" "$lockfile" 2>/dev/null; do ++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do + $show "Waiting for $lockfile to be removed" + sleep 2 + done +@@ -626,14 +869,19 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi +- $echo $srcfile > "$lockfile" ++ $echo "$srcfile" > "$lockfile" + fi + + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi ++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` ++ case $qsrcfile in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ qsrcfile="\"$qsrcfile\"" ;; ++ esac + + $run $rm "$libobj" "${libobj}T" + +@@ -655,18 +903,18 @@ + fbsd_hideous_sh_bug=$base_compile + + if test "$pic_mode" != no; then +- command="$base_compile $srcfile $pic_flag" ++ command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code +- command="$base_compile $srcfile" ++ command="$base_compile $qsrcfile" + fi + + if test ! -d "${xdir}$objdir"; then + $show "$mkdir ${xdir}$objdir" + $run $mkdir ${xdir}$objdir +- status=$? +- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then ++ exit $exit_status + fi + fi + +@@ -681,7 +929,7 @@ + if $run eval "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -701,7 +949,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one +@@ -722,7 +970,9 @@ + EOF + + # Allow error messages only from the first compilation. +- suppress_output=' >/dev/null 2>&1' ++ if test "$suppress_opt" = yes; then ++ suppress_output=' >/dev/null 2>&1' ++ fi + else + # No PIC object so indicate it doesn't exist in the libtool + # object file. +@@ -736,9 +986,9 @@ + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code +- command="$base_compile $srcfile" ++ command="$base_compile $qsrcfile" + else +- command="$base_compile $srcfile $pic_flag" ++ command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then + command="$command -o $obj" +@@ -751,7 +1001,7 @@ + if $run eval "$command"; then : + else + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test "$need_locks" = warn && +@@ -771,7 +1021,7 @@ + compiler." + + $run $rm $removelist +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed +@@ -809,7 +1059,7 @@ + $run $rm "$lockfile" + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool link mode +@@ -835,7 +1085,7 @@ + ;; + esac + libtool_args="$nonopt" +- base_compile="$nonopt" ++ base_compile="$nonopt $@" + compile_command="$nonopt" + finalize_command="$nonopt" + +@@ -847,7 +1097,6 @@ + old_convenience= + deplibs= + old_deplibs= +- add_flags= + compiler_flags= + linker_flags= + dllsearchpath= +@@ -868,6 +1117,8 @@ + no_install=no + objs= + non_pic_objects= ++ notinst_path= # paths that contain not-installed libtool libraries ++ precious_files_regex= + prefer_static_libs=no + preload=no + prev= +@@ -881,6 +1132,8 @@ + vinfo= + vinfo_number=no + ++ func_infer_tag $base_compile ++ + # We need to know -static, to get the right output filenames. + for arg + do +@@ -893,14 +1146,15 @@ + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi ++ prefer_static_libs=yes + else + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi ++ prefer_static_libs=built + fi + build_libtool_libs=no + build_old_libs=yes +- prefer_static_libs=yes + break + ;; + esac +@@ -912,7 +1166,6 @@ + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" +- base_compile="$base_compile $arg" + shift + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +@@ -976,7 +1229,7 @@ + export_symbols="$arg" + if test ! -f "$arg"; then + $echo "$modename: symbol file \`$arg' does not exist" +- exit 1 ++ exit $EXIT_FAILURE + fi + prev= + continue +@@ -991,6 +1244,11 @@ + prev= + continue + ;; ++ precious_regex) ++ precious_files_regex="$arg" ++ prev= ++ continue ++ ;; + release) + release="-$arg" + prev= +@@ -1023,7 +1281,7 @@ + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. +@@ -1071,12 +1329,17 @@ + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + else + # Dry-run case. + +@@ -1097,7 +1360,7 @@ + done + else + $echo "$modename: link input file \`$save_arg' does not exist" +- exit 1 ++ exit $EXIT_FAILURE + fi + arg=$save_arg + prev= +@@ -1109,7 +1372,7 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + if test "$prev" = rpath; then +@@ -1149,16 +1412,15 @@ + finalize_command="$finalize_command $qarg" + continue + ;; +- framework) +- case $host in +- *-*-darwin*) +- case "$deplibs " in +- *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later +- ;; +- esac +- ;; +- esac ++ shrext) ++ shrext_cmds="$arg" ++ prev= ++ continue ++ ;; ++ darwin_framework|darwin_framework_skip) ++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" + prev= + continue + ;; +@@ -1210,7 +1472,7 @@ + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + $echo "$modename: more than one -exported-symbols argument is not allowed" +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms +@@ -1220,6 +1482,18 @@ + continue + ;; + ++ -framework|-arch|-isysroot) ++ case " $CC " in ++ *" ${arg} ${1} "* | *" ${arg} ${1} "*) ++ prev=darwin_framework_skip ;; ++ *) compiler_flags="$compiler_flags $arg" ++ prev=darwin_framework ;; ++ esac ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ continue ++ ;; ++ + -inst-prefix-dir) + prev=inst_prefix + continue +@@ -1246,7 +1520,8 @@ + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 +- exit 1 ++ absdir="$dir" ++ notinst_path="$notinst_path $dir" + fi + dir="$absdir" + ;; +@@ -1260,10 +1535,15 @@ + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + continue +@@ -1272,26 +1552,35 @@ + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in +- *-*-cygwin* | *-*-pw32* | *-*-beos*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) + # These systems don't actually have a C or math library (as such) + continue + ;; +- *-*-mingw* | *-*-os2*) ++ *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" ++ deplibs="$deplibs -framework System" + continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ test "X$arg" = "X-lc" && continue ++ ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1301,18 +1590,41 @@ + continue + ;; + ++ # Tru64 UNIX uses -model [arg] to determine the layout of C++ ++ # classes, name mangling, and exception handling. ++ -model) ++ compile_command="$compile_command $arg" ++ compiler_flags="$compiler_flags $arg" ++ finalize_command="$finalize_command $arg" ++ prev=xcompiler ++ continue ++ ;; ++ ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ compiler_flags="$compiler_flags $arg" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ continue ++ ;; ++ + -module) + module=yes + continue + ;; + +- # gcc -m* arguments should be passed to the linker via $compiler_flags +- # in order to pass architecture information to the linker +- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo +- # but this is not reliable with gcc because gcc may use -mfoo to +- # select a different linker, different libraries, etc, while +- # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler ++ # -r[0-9][0-9]* specifies the processor on the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # +DA*, +DD* enable 64-bit mode on the HP compiler ++ # -q* pass through compiler args for the IBM compiler ++ # -m* pass through architecture-specific compiler args for GCC ++ # -m*, -t[45]*, -txscale* pass through architecture-specific ++ # compiler args for GCC ++ # -pg pass through profiling flag for GCC ++ # @file GCC response files ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ ++ -t[45]*|-txscale*|@*) ++ + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1323,9 +1635,7 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then +- compiler_flags="$compiler_flags $arg" +- fi ++ compiler_flags="$compiler_flags $arg" + continue + ;; + +@@ -1365,6 +1675,11 @@ + + -o) prev=output ;; + ++ -precious-files-regex) ++ prev=precious_regex ++ continue ++ ;; ++ + -release) + prev=release + continue +@@ -1387,7 +1702,7 @@ + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + case "$xrpath " in +@@ -1473,11 +1788,6 @@ + continue + ;; + +- -framework) +- prev=framework +- continue +- ;; +- + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need +@@ -1488,7 +1798,6 @@ + arg="\"$arg\"" + ;; + esac +- add_flags="$add_flags $arg" + ;; + + *.$objext) +@@ -1516,7 +1825,7 @@ + test "$pic_object" = none && \ + test "$non_pic_object" = none; then + $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Extract subdirectory from the argument. +@@ -1564,12 +1873,17 @@ + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if test -z "$run"; then + $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + else + # Dry-run case. + +@@ -1623,7 +1937,6 @@ + arg="\"$arg\"" + ;; + esac +- add_flags="$add_flags $arg" + ;; + esac # arg + +@@ -1637,48 +1950,7 @@ + if test -n "$prev"; then + $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 +- fi +- +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base link +- # command doesn't match the default compiler. +- if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case $base_compile in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) +- # The compiler in $compile_command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi +- ;; +- esac ++ exit $EXIT_FAILURE + fi + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +@@ -1711,9 +1983,9 @@ + if test ! -d "$output_objdir"; then + $show "$mkdir $output_objdir" + $run $mkdir $output_objdir +- status=$? +- if test "$status" -ne 0 && test ! -d "$output_objdir"; then +- exit $status ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then ++ exit $exit_status + fi + fi + +@@ -1722,7 +1994,7 @@ + "") + $echo "$modename: you must specify an output file" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; +@@ -1732,7 +2004,7 @@ + + case $host in + *cygwin* | *mingw* | *pw32*) +- # don't eliminate duplcations in $postdeps and $predeps ++ # don't eliminate duplications in $postdeps and $predeps + duplicate_compiler_generated_deps=yes + ;; + *) +@@ -1776,7 +2048,6 @@ + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries +- notinst_path= # paths that contain not-installed libtool libraries + case $linkmode in + lib) + passes="conv link" +@@ -1785,7 +2056,7 @@ + *.la) ;; + *) + $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + done +@@ -1811,7 +2082,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -1823,18 +2097,23 @@ + lib= + found=no + case $deplib in ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ compiler_flags="$compiler_flags $deplib" ++ fi ++ continue ++ ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 + continue + fi +- if test "$pass" = conv && test "$allow_undefined" = yes; then +- deplibs="$deplib $deplibs" +- continue +- fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` + for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do +- for search_ext in .la $shrext .so .a; do ++ for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then +@@ -1895,18 +2174,6 @@ + fi + fi + ;; # -l +- *.ltframework) +- if test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- deplibs="$deplib $deplibs" +- if test "$linkmode" = lib ; then +- newdependency_libs="$deplib $newdependency_libs" +- fi +- fi +- continue +- ;; + -L*) + case $linkmode in + lib) +@@ -1922,11 +2189,11 @@ + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" +- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi ++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + ;; + *) + $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 +@@ -1954,7 +2221,22 @@ + fi + case $linkmode in + lib) +- if test "$deplibs_check_method" != pass_all; then ++ valid_a_lib=no ++ case $deplibs_check_method in ++ match_pattern*) ++ set dummy $deplibs_check_method ++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` ++ if eval $echo \"$deplib\" 2>/dev/null \ ++ | $SED 10q \ ++ | $EGREP "$match_pattern_regex" > /dev/null; then ++ valid_a_lib=yes ++ fi ++ ;; ++ pass_all) ++ valid_a_lib=yes ++ ;; ++ esac ++ if test "$valid_a_lib" != yes; then + $echo + $echo "*** Warning: Trying to link with static lib archive $deplib." + $echo "*** I have the capability to make that library automatically link in when" +@@ -2004,15 +2286,15 @@ + esac # case $deplib + if test "$found" = yes || test -f "$lib"; then : + else +- $echo "$modename: cannot find the library \`$lib'" 1>&2 +- exit 1 ++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 ++ exit $EXIT_FAILURE + fi + + # Check to see that this really is a libtool archive. + if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` +@@ -2028,6 +2310,8 @@ + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no ++ avoidtemprpath= ++ + + # Read the .la file + case $lib in +@@ -2035,13 +2319,6 @@ + *) . ./$lib ;; + esac + +- case $host in +- *-*-darwin*) +- # Convert "-framework foo" to "foo.ltframework" in dependency_libs +- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` +- ;; +- esac +- + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -2052,33 +2329,32 @@ + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" +- tmp_libs= +- for deplib in $dependency_libs; do +- #echo "Adding $deplib to \$deplibs" +- deplibs="$deplib $deplibs" +- if test "X$duplicate_deps" = "Xyes" ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done + if test -z "$libdir"; then + if test -z "$old_library"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if test "X$duplicate_deps" = "Xyes" ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + $echo "$modename: \`$lib' is not a convenience library" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + continue + fi # $pass = conv + +- ++ + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do +@@ -2086,16 +2362,18 @@ + done + if test -z "$linklib"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi +- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ if test -z "$dlname" || ++ test "$dlopen_support" != yes || ++ test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't +@@ -2132,11 +2410,19 @@ + dir="$libdir" + absdir="$libdir" + fi ++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +- dir="$ladir/$objdir" +- absdir="$abs_ladir/$objdir" +- # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ dir="$ladir" ++ absdir="$abs_ladir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ else ++ dir="$ladir/$objdir" ++ absdir="$abs_ladir/$objdir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ fi + fi # $installed = yes + name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + +@@ -2144,7 +2430,7 @@ + if test "$pass" = dlpreopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). +@@ -2171,7 +2457,7 @@ + continue + fi + +- ++ + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" +@@ -2209,12 +2495,12 @@ + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + # We need to hardcode the library path +- if test -n "$shlibpath_var"; then ++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath " in + *" $dir "*) ;; + *" $absdir "*) ;; +- *) temp_rpath="$temp_rpath $dir" ;; ++ *) temp_rpath="$temp_rpath $absdir" ;; + esac + fi + +@@ -2251,24 +2537,29 @@ + fi + + link_static=no # Whether the deplib will be linked statically ++ use_static_libs=$prefer_static_libs ++ if test "$use_static_libs" = built && test "$installed" = yes ; then ++ use_static_libs=no ++ fi + if test -n "$library_names" && +- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then ++ { test "$use_static_libs" = no || test -z "$old_library"; }; then + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" + need_relink=yes + fi + # This is a shared library +- +- # Warn about portability, can't link against -module's on some systems (darwin) +- if test "$shouldnotlink" = yes && test "$pass" = link ; then ++ ++ # Warn about portability, can't link against -module's on ++ # some systems (darwin) ++ if test "$shouldnotlink" = yes && test "$pass" = link ; then + $echo + if test "$linkmode" = prog; then + $echo "*** Warning: Linking the executable $output against the loadable module" + else + $echo "*** Warning: Linking the shared library $output against the loadable module" + fi +- $echo "*** $linklib is not portable!" +- fi ++ $echo "*** $linklib is not portable!" ++ fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. +@@ -2326,9 +2617,10 @@ + else + $show "extracting exported symbol list from \`$soname'" + save_ifs="$IFS"; IFS='~' +- eval cmds=\"$extract_expsyms_cmds\" ++ cmds=$extract_expsyms_cmds + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -2339,9 +2631,10 @@ + if test -f "$output_objdir/$newlib"; then :; else + $show "generating import library for \`$soname'" + save_ifs="$IFS"; IFS='~' +- eval cmds=\"$old_archive_from_expsyms_cmds\" ++ cmds=$old_archive_from_expsyms_cmds + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -2362,11 +2655,15 @@ + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in +- *-*-sco3.2v5* ) add_dir="-L$dir" ;; ++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; ++ *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ ++ *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) +- # if the lib is a module then we can not link against it, someone +- # is ignoring the new warnings I added +- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then ++ # if the lib is a module then we can not link against ++ # it, someone is ignoring the new warnings I added ++ if /usr/bin/file -L $add 2> /dev/null | ++ $EGREP ": [^:]* bundle" >/dev/null ; then + $echo "** Warning, lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $echo +@@ -2374,7 +2671,7 @@ + $echo "** The link will probably fail, sorry" + else + add="$dir/$old_library" +- fi ++ fi + fi + esac + elif test "$hardcode_minus_L" = no; then +@@ -2397,9 +2694,9 @@ + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) +- add_dir="-L$inst_prefix_dir$libdir $add_dir" ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -2416,7 +2713,7 @@ + + if test "$lib_linked" != yes; then + $echo "$modename: configuration error: unsupported hardcode properties" +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$add_shlibpath"; then +@@ -2459,7 +2756,8 @@ + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then ++ if test -n "$inst_prefix_dir" && ++ test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" +@@ -2469,9 +2767,9 @@ + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) +- add_dir="-L$inst_prefix_dir$libdir $add_dir" ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi +@@ -2530,17 +2828,16 @@ + fi + fi + else +- convenience="$convenience $dir/$old_library" +- old_convenience="$old_convenience $dir/$old_library" + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then +- #if test -n "$dependency_libs" && +- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || +- # test "$link_static" = yes; }; then ++ if test -n "$dependency_libs" && ++ { test "$hardcode_into_libs" != yes || ++ test "$build_old_libs" = yes || ++ test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do +@@ -2554,7 +2851,7 @@ + esac + done + dependency_libs="$temp_deplibs" +- #fi ++ fi + + newlib_search_path="$newlib_search_path $absdir" + # Link against this library +@@ -2596,20 +2893,18 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -z "$libdir"; then + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "$absdir" != "$libdir"; then +- # Sure, some shells/systems don't implement the -ef. +- # Those will have to live with the warning. +- test "$absdir" -ef "$libdir" > /dev/null 2>&1 || +- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 ++ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 + fi + path="$absdir" + fi + depdepl= + case $host in + *-*-darwin*) +- # we do not want to link against static libs, but need to link against shared ++ # we do not want to link against static libs, ++ # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do +@@ -2617,55 +2912,45 @@ + done + if test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" +- fi ++ fi + # do not add paths which are already there + case " $newlib_search_path " in + *" $path "*) ;; + *) newlib_search_path="$newlib_search_path $path";; + esac +- path="" + fi ++ path="" + ;; + *) +- path="-L$path" +- ;; +- esac +- ++ path="-L$path" ++ ;; ++ esac + ;; +- -l*) ++ -l*) + case $host in + *-*-darwin*) +- # Again, we only want to link against shared libraries +- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` +- for tmp in $newlib_search_path ; do +- if test -f "$tmp/lib$tmp_libs.dylib" ; then +- eval depdepl="$tmp/lib$tmp_libs.dylib" +- break +- fi +- done +- path="" ++ # Again, we only want to link against shared libraries ++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` ++ for tmp in $newlib_search_path ; do ++ if test -f "$tmp/lib$tmp_libs.dylib" ; then ++ eval depdepl="$tmp/lib$tmp_libs.dylib" ++ break ++ fi ++ done ++ path="" + ;; + *) continue ;; +- esac +- ;; +- +- *.ltframework) +- case $host in +- *-*-darwin*) +- depdepl="$deplib" +- ;; + esac + ;; +- + *) continue ;; + esac + case " $deplibs " in +- *" $depdepl "*) ;; +- *) deplibs="$deplibs $depdepl" ;; +- esac +- case " $deplibs " in + *" $path "*) ;; +- *) deplibs="$deplibs $path" ;; ++ *) deplibs="$path $deplibs" ;; ++ esac ++ case " $deplibs " in ++ *" $depdepl "*) ;; ++ *) deplibs="$depdepl $deplibs" ;; + esac + done + fi # link_all_deplibs != no +@@ -2752,7 +3037,8 @@ + eval $var=\"$tmp_libs\" + done # for var + fi +- # Last step: remove runtime libs from dependency_libs (they stay in deplibs) ++ # Last step: remove runtime libs from dependency_libs ++ # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in +@@ -2812,19 +3098,19 @@ + case $outputname in + lib*) + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + if test "$module" = no; then + $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` +@@ -2835,7 +3121,7 @@ + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 +- exit 1 ++ exit $EXIT_FAILURE + else + $echo + $echo "*** Warning: Linking the shared library $output against the non-libtool" +@@ -2883,13 +3169,13 @@ + if test -n "$8"; then + $echo "$modename: too many parameters to \`-version-info'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible +- ++ + case $vinfo_number in + yes) + number_major="$2" +@@ -2918,6 +3204,11 @@ + age="$number_minor" + revision="$number_minor" + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) +@@ -2929,36 +3220,36 @@ + + # Check that each of the things are valid numbers. + case $current in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 ++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + case $revision in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 ++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + case $age in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 ++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + if test "$age" -gt "$current"; then + $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Calculate the version variables. +@@ -2975,7 +3266,7 @@ + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + minor_current=`expr $current + 1` +- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + ;; + + freebsd-aout) +@@ -3047,7 +3338,7 @@ + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -3098,9 +3389,15 @@ + tempremovelist=`$echo "$output_objdir/*"` + for p in $tempremovelist; do + case $p in +- *.$objext | *$exeext) ++ *.$objext) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) ++ if test "X$precious_files_regex" != "X"; then ++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 ++ then ++ continue ++ fi ++ fi + removelist="$removelist $p" + ;; + *) ;; +@@ -3122,9 +3419,9 @@ + + # Eliminate all temporary directories. + for path in $notinst_path; do +- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` +- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` +- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` ++ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` ++ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` ++ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + done + + if test -n "$xrpath"; then +@@ -3137,7 +3434,7 @@ + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done +- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then ++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi +@@ -3170,14 +3467,19 @@ + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ deplibs="$deplibs -framework System" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. +- test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. +@@ -3221,11 +3523,11 @@ + int main() { return 0; } + EOF + $rm conftest +- $LTCC -o conftest conftest.c $deplibs ++ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs + if test "$?" -eq 0 ; then + ldd_output=`ldd conftest` + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name=`expr $i : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" -ne "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +@@ -3262,11 +3564,11 @@ + # Error occurred in the first compile. Let's try to salvage + # the situation: Compile a separate program for each library. + for i in $deplibs; do +- name="`expr $i : '-l\(.*\)'`" ++ name=`expr $i : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" != "0"; then + $rm conftest +- $LTCC -o conftest conftest.c $i ++ $LTCC $LTCFLAGS -o conftest conftest.c $i + # Did it work? + if test "$?" -eq 0 ; then + ldd_output=`ldd conftest` +@@ -3314,7 +3616,7 @@ + set dummy $deplibs_check_method + file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name=`expr $a_deplib : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test "$name" != "" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +@@ -3383,7 +3685,7 @@ + set dummy $deplibs_check_method + match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" ++ name=`expr $a_deplib : '-l\(.*\)'` + # If $name is empty we are operating on a -L argument. + if test -n "$name" && test "$name" != "0"; then + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +@@ -3463,7 +3765,7 @@ + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + +@@ -3509,17 +3811,39 @@ + fi + fi + fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- case $host in +- *-*-darwin*) +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- ;; +- esac + # Done checking deplibs! + deplibs=$newdeplibs + fi + ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ deplibs="$new_libs" ++ ++ + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= +@@ -3532,7 +3856,7 @@ + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath" ++ test "$mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then +@@ -3587,7 +3911,7 @@ + fi + + # Get the real and link names of the library. +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + realname="$2" +@@ -3603,6 +3927,7 @@ + fi + + lib="$output_objdir/$realname" ++ linknames= + for link + do + linknames="$linknames $link" +@@ -3617,10 +3942,11 @@ + $show "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $run $rm $export_symbols +- eval cmds=\"$export_symbols_cmds\" ++ cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + if len=`expr "X$cmd" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + $show "$cmd" +@@ -3630,6 +3956,9 @@ + # The command line is too long to execute in one step. + $show "using reloadable object file for export list..." + skipped_export=: ++ # Break out early, otherwise skipped_export may be ++ # set to false by a later but shorter cmd. ++ break + fi + done + IFS="$save_ifs" +@@ -3650,12 +3979,12 @@ + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; +- *) ++ *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done +- deplibs="$tmp_deplibs" ++ deplibs="$tmp_deplibs" + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +@@ -3663,67 +3992,13 @@ + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${outputname}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- for xlib in $convenience; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $convenience ++ libobjs="$libobjs $func_extract_archives_result" + fi + fi +- ++ + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linker_flags="$linker_flags $flag" +@@ -3734,31 +4009,27 @@ + $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? + fi + +- # Add all flags from the command line. We here create a library, +- # but those flags were only added to compile_command and +- # finalize_command, which are only used when creating executables. +- # So do it by hand here. +- compiler_flags="$compiler_flags $add_flags" +- # Only add it to commands which use CC, instead of LD, i.e. +- # only to $compiler_flags +- #linker_flags="$linker_flags $add_flags" +- + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval cmds=\"$module_expsym_cmds\" ++ eval test_cmds=\"$module_expsym_cmds\" ++ cmds=$module_expsym_cmds + else +- eval cmds=\"$module_cmds\" ++ eval test_cmds=\"$module_cmds\" ++ cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval cmds=\"$archive_expsym_cmds\" ++ eval test_cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds + else +- eval cmds=\"$archive_cmds\" ++ eval test_cmds=\"$archive_cmds\" ++ cmds=$archive_cmds + fi + fi + +- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && ++ if test "X$skipped_export" != "X:" && ++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else +@@ -3777,6 +4048,7 @@ + save_libobjs=$libobjs + fi + save_output=$output ++ output_la=`$echo "X$output" | $Xsed -e "$basename"` + + # Clear the reloadable object creation command queue and + # initialize k to one. +@@ -3786,13 +4058,13 @@ + delfiles= + last_robj= + k=1 +- output=$output_objdir/$save_output-${k}.$objext ++ output=$output_objdir/$output_la-${k}.$objext + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + eval test_cmds=\"$reload_cmds $objlist $last_robj\" + if test "X$objlist" = X || +- { len=`expr "X$test_cmds" : ".*"` && ++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len"; }; then + objlist="$objlist $obj" + else +@@ -3806,9 +4078,9 @@ + # the last one created. + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" + fi +- last_robj=$output_objdir/$save_output-${k}.$objext ++ last_robj=$output_objdir/$output_la-${k}.$objext + k=`expr $k + 1` +- output=$output_objdir/$save_output-${k}.$objext ++ output=$output_objdir/$output_la-${k}.$objext + objlist=$obj + len=1 + fi +@@ -3828,13 +4100,13 @@ + eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" + fi + +- # Set up a command to remove the reloadale object files ++ # Set up a command to remove the reloadable object files + # after they are used. + i=0 + while test "$i" -lt "$k" + do + i=`expr $i + 1` +- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" ++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" + done + + $echo "creating a temporary reloadable object file: $output" +@@ -3859,28 +4131,54 @@ + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ cmds=$module_expsym_cmds ++ else ++ cmds=$module_cmds ++ fi ++ else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds + else +- eval cmds=\"$archive_cmds\" ++ cmds=$archive_cmds ++ fi + fi + + # Append the command to remove the reloadable object files + # to the just-reset $cmds. +- eval cmds=\"\$cmds~$rm $delfiles\" ++ eval cmds=\"\$cmds~\$rm $delfiles\" + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" +- $run eval "$cmd" || exit $? ++ $run eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi ++ ++ exit $lt_exit ++ } + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? +- exit 0 ++ ++ if test -n "$convenience"; then ++ if test -z "$whole_archive_flag_spec"; then ++ $show "${rm}r $gentop" ++ $run ${rm}r "$gentop" ++ fi ++ fi ++ ++ exit $EXIT_SUCCESS + fi + + # Create links to the real library. +@@ -3928,7 +4226,7 @@ + *.lo) + if test -n "$objs$old_deplibs"; then + $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + libobj="$output" + obj=`$echo "X$output" | $Xsed -e "$lo2o"` +@@ -3957,64 +4255,10 @@ + eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${obj}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- for xlib in $convenience; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $convenience ++ reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + +@@ -4022,10 +4266,11 @@ + reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + + output="$obj" +- eval cmds=\"$reload_cmds\" ++ cmds=$reload_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -4038,7 +4283,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then +@@ -4051,17 +4296,18 @@ + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $run eval "echo timestamp > $libobj" || exit $? +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" +- eval cmds=\"$reload_cmds\" ++ cmds=$reload_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -4073,7 +4319,7 @@ + $run ${rm}r $gentop + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + prog) +@@ -4098,24 +4344,50 @@ + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + + case $host in +- *-*-darwin*) ++ *darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + if test "$tagname" = CXX ; then + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $compile_deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $compile_deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ compile_deplibs="$new_libs" ++ ++ + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" + +@@ -4160,10 +4432,15 @@ + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + done +@@ -4277,13 +4554,25 @@ + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then +- export_symbols="$output_objdir/$output.exp" ++ export_symbols="$output_objdir/$outputname.exp" + $run $rm $export_symbols +- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac + else +- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' +- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' ++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + $run eval 'mv "$nlist"T "$nlist"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac + fi + fi + +@@ -4334,7 +4623,26 @@ + #endif + + /* The mapping between symbol names and symbols. */ ++" ++ ++ case $host in ++ *cygwin* | *mingw* ) ++ $echo >> "$output_objdir/$dlsyms" "\ ++/* DATA imports from DLLs on WIN32 can't be const, because ++ runtime relocations are performed -- see ld's documentation ++ on pseudo-relocs */ ++struct { ++" ++ ;; ++ * ) ++ $echo >> "$output_objdir/$dlsyms" "\ + const struct { ++" ++ ;; ++ esac ++ ++ ++ $echo >> "$output_objdir/$dlsyms" "\ + const char *name; + lt_ptr address; + } +@@ -4381,20 +4689,33 @@ + esac + + # Now compile the dynamic symbol file. +- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" +- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? ++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + + # Clean up the generated files. + $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" + $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + + # Transform the symbol file into the correct name. +- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ case $host in ++ *cygwin* | *mingw* ) ++ if test -f "$output_objdir/${outputname}.def" ; then ++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` ++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` ++ else ++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ fi ++ ;; ++ * ) ++ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ++ ;; ++ esac + ;; + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + else +@@ -4407,17 +4728,6 @@ + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi + +- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G +- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath. +- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld. +- # This does not apply on AIX for ia64, which uses a SysV linker. +- case "$host" in +- ia64-*-aix5*) ;; +- *-*-aix4* | *-*-aix5*) +- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` +- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;; +- esac +- + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + # Replace the output file specification. + compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` +@@ -4426,7 +4736,7 @@ + # We have no uninstalled library dependencies, so finalize right now. + $show "$link_command" + $run eval "$link_command" +- status=$? ++ exit_status=$? + + # Delete the generated files. + if test -n "$dlsyms"; then +@@ -4434,7 +4744,7 @@ + $run $rm "$output_objdir/${outputname}S.${objext}" + fi + +- exit $status ++ exit $exit_status + fi + + if test -n "$shlibpath_var"; then +@@ -4493,7 +4803,7 @@ + # Link the executable and exit + $show "$link_command" + $run eval "$link_command" || exit $? +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$hardcode_action" = relink; then +@@ -4548,10 +4858,10 @@ + fi + + # Quote $echo for shipping. +- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then +- case $0 in +- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; +- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; ++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then ++ case $progpath in ++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; ++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` + else +@@ -4573,11 +4883,13 @@ + *) exeext= ;; + esac + case $host in +- *mingw* ) +- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c` +- cwrapper=`$echo ${output}.exe` +- $rm $cwrappersource $cwrapper +- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 ++ *cygwin* | *mingw* ) ++ output_name=`basename $output` ++ output_path=`dirname $output` ++ cwrappersource="$output_path/$objdir/lt-$output_name.c" ++ cwrapper="$output_path/$output_name.exe" ++ $rm $cwrappersource $cwrapper ++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + cat > $cwrappersource < + #include + #include ++#include ++#include ++#include + + #if defined(PATH_MAX) + # define LT_PATHMAX PATH_MAX +@@ -4612,15 +4927,19 @@ + #endif + + #ifndef DIR_SEPARATOR +-#define DIR_SEPARATOR '/' ++# define DIR_SEPARATOR '/' ++# define PATH_SEPARATOR ':' + #endif + + #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +-#define HAVE_DOS_BASED_FILE_SYSTEM +-#ifndef DIR_SEPARATOR_2 +-#define DIR_SEPARATOR_2 '\\' +-#endif ++# define HAVE_DOS_BASED_FILE_SYSTEM ++# ifndef DIR_SEPARATOR_2 ++# define DIR_SEPARATOR_2 '\\' ++# endif ++# ifndef PATH_SEPARATOR_2 ++# define PATH_SEPARATOR_2 ';' ++# endif + #endif + + #ifndef DIR_SEPARATOR_2 +@@ -4630,17 +4949,32 @@ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) + #endif /* DIR_SEPARATOR_2 */ + ++#ifndef PATH_SEPARATOR_2 ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) ++#else /* PATH_SEPARATOR_2 */ ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) ++#endif /* PATH_SEPARATOR_2 */ ++ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) + #define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ + } while (0) + ++/* -DDEBUG is fairly common in CFLAGS. */ ++#undef DEBUG ++#if defined DEBUGWRAPPER ++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) ++#else ++# define DEBUG(format, ...) ++#endif ++ + const char *program_name = NULL; + + void * xmalloc (size_t num); + char * xstrdup (const char *string); +-char * basename (const char *name); +-char * fnqualify(const char *path); ++const char * base_name (const char *name); ++char * find_executable(const char *wrapper); ++int check_executable(const char *path); + char * strendzap(char *str, const char *pat); + void lt_fatal (const char *message, ...); + +@@ -4649,30 +4983,52 @@ + { + char **newargz; + int i; +- +- program_name = (char *) xstrdup ((char *) basename (argv[0])); ++ ++ program_name = (char *) xstrdup (base_name (argv[0])); ++ DEBUG("(main) argv[0] : %s\n",argv[0]); ++ DEBUG("(main) program_name : %s\n",program_name); + newargz = XMALLOC(char *, argc+2); + EOF + +- cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" +- newargz[1] = fnqualify(argv[0]); ++ cat >> $cwrappersource <<"EOF" ++ newargz[1] = find_executable(argv[0]); ++ if (newargz[1] == NULL) ++ lt_fatal("Couldn't find %s", argv[0]); ++ DEBUG("(main) found exe at : %s\n",newargz[1]); + /* we know the script has the same name, without the .exe */ + /* so make sure newargz[1] doesn't end in .exe */ +- strendzap(newargz[1],".exe"); ++ strendzap(newargz[1],".exe"); + for (i = 1; i < argc; i++) + newargz[i+1] = xstrdup(argv[i]); + newargz[argc+1] = NULL; ++ ++ for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" ++ cat >> $cwrappersource <<"EOF" ++ return 127; + } + + void * +@@ -4685,59 +5041,159 @@ + return p; + } + +-char * ++char * + xstrdup (const char *string) + { + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL + ; + } + +-char * +-basename (const char *name) ++const char * ++base_name (const char *name) + { + const char *base; + + #if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ +- if (isalpha (name[0]) && name[1] == ':') ++ if (isalpha ((unsigned char)name[0]) && name[1] == ':') + name += 2; + #endif + + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; +- return (char *) base; ++ return base; + } + +-char * +-fnqualify(const char *path) ++int ++check_executable(const char * path) ++{ ++ struct stat st; ++ ++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); ++ if ((!path) || (!*path)) ++ return 0; ++ ++ if ((stat (path, &st) >= 0) && ++ ( ++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ ++#if defined (S_IXOTH) ++ ((st.st_mode & S_IXOTH) == S_IXOTH) || ++#endif ++#if defined (S_IXGRP) ++ ((st.st_mode & S_IXGRP) == S_IXGRP) || ++#endif ++ ((st.st_mode & S_IXUSR) == S_IXUSR)) ++ ) ++ return 1; ++ else ++ return 0; ++} ++ ++/* Searches for the full path of the wrapper. Returns ++ newly allocated full path name if found, NULL otherwise */ ++char * ++find_executable (const char* wrapper) + { +- size_t size; +- char *p; ++ int has_slash = 0; ++ const char* p; ++ const char* p_next; ++ /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; ++ int tmp_len; ++ char* concat_name; ++ ++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + +- assert(path != NULL); ++ if ((wrapper == NULL) || (*wrapper == '\0')) ++ return NULL; + +- /* Is it qualified already? */ ++ /* Absolute path? */ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ else ++ { ++#endif ++ if (IS_DIR_SEPARATOR (wrapper[0])) ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } + #if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- if (isalpha (path[0]) && path[1] == ':') +- return xstrdup (path); ++ } + #endif +- if (IS_DIR_SEPARATOR (path[0])) +- return xstrdup (path); + +- /* prepend the current directory */ +- /* doesn't handle '~' */ ++ for (p = wrapper; *p; p++) ++ if (*p == '/') ++ { ++ has_slash = 1; ++ break; ++ } ++ if (!has_slash) ++ { ++ /* no slashes; search PATH */ ++ const char* path = getenv ("PATH"); ++ if (path != NULL) ++ { ++ for (p = path; *p; p = p_next) ++ { ++ const char* q; ++ size_t p_len; ++ for (q = p; *q; q++) ++ if (IS_PATH_SEPARATOR(*q)) ++ break; ++ p_len = q - p; ++ p_next = (*q == '\0' ? q : q + 1); ++ if (p_len == 0) ++ { ++ /* empty path: current directory */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ } ++ else ++ { ++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, p, p_len); ++ concat_name[p_len] = '/'; ++ strcpy (concat_name + p_len + 1, wrapper); ++ } ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ } ++ /* not found in PATH; assume curdir */ ++ } ++ /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); +- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ +- p = XMALLOC(char, size); +- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); +- return p; ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ return NULL; + } + + char * +-strendzap(char *str, const char *pat) ++strendzap(char *str, const char *pat) + { + size_t len, patlen; + +@@ -4757,7 +5213,7 @@ + } + + static void +-lt_error_core (int exit_status, const char * mode, ++lt_error_core (int exit_status, const char * mode, + const char * message, va_list ap) + { + fprintf (stderr, "%s: %s: ", program_name, mode); +@@ -4777,16 +5233,16 @@ + va_end (ap); + } + EOF +- # we should really use a build-platform specific compiler +- # here, but OTOH, the wrappers (shell script and this C one) +- # are only useful if you want to execute the "real" binary. +- # Since the "real" binary is built for $host, then this +- # wrapper might as well be built for $host, too. +- $run $LTCC -s -o $cwrapper $cwrappersource +- ;; +- esac +- $rm $output +- trap "$rm $output; exit 1" 1 2 15 ++ # we should really use a build-platform specific compiler ++ # here, but OTOH, the wrappers (shell script and this C one) ++ # are only useful if you want to execute the "real" binary. ++ # Since the "real" binary is built for $host, then this ++ # wrapper might as well be built for $host, too. ++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource ++ ;; ++ esac ++ $rm $output ++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + + $echo > $output "\ + #! $SHELL +@@ -4807,7 +5263,7 @@ + + # The HP-UX ksh and POSIX shell print the target directory to stdout + # if CDPATH is set. +-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + relink_command=\"$relink_command\" + +@@ -4886,7 +5342,7 @@ + else + $echo \"\$relink_command_output\" >&2 + $rm \"\$progdir/\$file\" +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + +@@ -4936,34 +5392,32 @@ + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2*) + $echo >> $output "\ +- exec \$progdir\\\\\$program \${1+\"\$@\"} ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} + " + ;; + + *) +- # Need to set LD_LIBRARY_PATH, to the value already +- # computed within libtool. + $echo >> $output "\ +- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"} ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} + " + ;; + esac + $echo >> $output "\ + \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" +- exit 1 ++ exit $EXIT_FAILURE + fi + else + # The program doesn't exist. +- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 ++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$echo \"This script is just a wrapper for \$program.\" 1>&2 + $echo \"See the $PACKAGE documentation for more information.\" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi\ + " + chmod +x $output + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + esac + +@@ -4986,78 +5440,78 @@ + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- # Add in members from convenience archives. +- for xlib in $addlibs; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $addlibs ++ oldobjs="$oldobjs $func_extract_archives_result" + fi + +- compiler_flags="$compiler_flags $add_flags" +- + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then +- eval cmds=\"$old_archive_from_new_cmds\" ++ cmds=$old_archive_from_new_cmds + else ++ # POSIX demands no paths to be encoded in archives. We have ++ # to avoid creating archives with duplicate basenames if we ++ # might have to extract them afterwards, e.g., when creating a ++ # static archive out of a convenience library, or when linking ++ # the entirety of a libtool archive into another (currently ++ # not supported by libtool). ++ if (for obj in $oldobjs ++ do ++ $echo "X$obj" | $Xsed -e 's%^.*/%%' ++ done | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $echo "copying selected object files to avoid basename conflicts..." ++ ++ if test -z "$gentop"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ $show "${rm}r $gentop" ++ $run ${rm}r "$gentop" ++ $show "$mkdir $gentop" ++ $run $mkdir "$gentop" ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then ++ exit $exit_status ++ fi ++ fi ++ ++ save_oldobjs=$oldobjs ++ oldobjs= ++ counter=1 ++ for obj in $save_oldobjs ++ do ++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` ++ case " $oldobjs " in ++ " ") oldobjs=$obj ;; ++ *[\ /]"$objbase "*) ++ while :; do ++ # Make sure we don't pick an alternate name that also ++ # overlaps. ++ newobj=lt$counter-$objbase ++ counter=`expr $counter + 1` ++ case " $oldobjs " in ++ *[\ /]"$newobj "*) ;; ++ *) if test ! -f "$gentop/$newobj"; then break; fi ;; ++ esac ++ done ++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" ++ $run ln "$obj" "$gentop/$newobj" || ++ $run cp "$obj" "$gentop/$newobj" ++ oldobjs="$oldobjs $gentop/$newobj" ++ ;; ++ *) oldobjs="$oldobjs $obj" ;; ++ esac ++ done ++ fi ++ + eval cmds=\"$old_archive_cmds\" + + if len=`expr "X$cmds" : ".*"` && + test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- : ++ cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + $echo "using piecewise archive linking..." +@@ -5066,31 +5520,18 @@ + objlist= + concat_cmds= + save_oldobjs=$oldobjs +- # GNU ar 2.10+ was changed to match POSIX; thus no paths are +- # encoded into archives. This makes 'ar r' malfunction in +- # this piecewise linking case whenever conflicting object +- # names appear in distinct ar calls; check, warn and compensate. +- if (for obj in $save_oldobjs +- do +- $echo "X$obj" | $Xsed -e 's%^.*/%%' +- done | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 +- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 +- AR_FLAGS=cq +- fi ++ + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj +- done ++ done + for obj in $save_oldobjs + do + oldobjs="$objlist $obj" + objlist="$objlist $obj" + eval test_cmds=\"$old_archive_cmds\" +- if len=`expr "X$test_cmds" : ".*"` && ++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && + test "$len" -le "$max_cmd_len"; then + : + else +@@ -5098,7 +5539,7 @@ + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB +- fi ++ fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= +@@ -5109,12 +5550,13 @@ + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else +- eval cmds=\"\$concat_cmds~$old_archive_cmds\" ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do ++ eval cmd=\"$cmd\" + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? +@@ -5146,11 +5588,13 @@ + fi + done + # Quote the link command for shipping. +- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" ++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then +- relink_command= +- fi ++ relink_command= ++ fi ++ ++ + # Only create the output if not a dry run. + if test -z "$run"; then + for installed in no yes; do +@@ -5168,7 +5612,7 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -z "$libdir"; then + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdependency_libs="$newdependency_libs $libdir/$name" + ;; +@@ -5182,7 +5626,7 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + if test -z "$libdir"; then + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdlfiles="$newdlfiles $libdir/$name" + done +@@ -5193,11 +5637,30 @@ + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + if test -z "$libdir"; then + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + newdlprefiles="$newdlprefiles $libdir/$name" + done + dlprefiles="$newdlprefiles" ++ else ++ newdlfiles= ++ for lib in $dlfiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlfiles="$newdlfiles $abs" ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlprefiles="$newdlprefiles $abs" ++ done ++ dlprefiles="$newdlprefiles" + fi + $rm $output + # place dlname in correct position for cygwin +@@ -5241,7 +5704,7 @@ + + # Directory that this library needs to be installed in: + libdir='$install_libdir'" +- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then ++ if test "$installed" = no && test "$need_relink" = yes; then + $echo >> $output "\ + relink_command=\"$relink_command\"" + fi +@@ -5254,7 +5717,7 @@ + $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + ;; + esac +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + # libtool install mode +@@ -5265,11 +5728,11 @@ + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. +- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then ++ $echo "X$nonopt" | grep shtool > /dev/null; then + # Aesthetically quote it. + arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5278,14 +5741,14 @@ + shift + else + install_prog= +- arg="$nonopt" ++ arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5303,28 +5766,31 @@ + do + if test -n "$dest"; then + files="$files $dest" +- dest="$arg" ++ dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; +- -f) prev="-f" ;; +- -g) prev="-g" ;; +- -m) prev="-m" ;; +- -o) prev="-o" ;; ++ -f) ++ case " $install_prog " in ++ *[\\\ /]cp\ *) ;; ++ *) prev=$arg ;; ++ esac ++ ;; ++ -g | -m | -o) prev=$arg ;; + -s) + stripme=" -s" + continue + ;; +- -*) ;; +- ++ -*) ++ ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + prev= + else +- dest="$arg" ++ dest=$arg + continue + fi + ;; +@@ -5333,7 +5799,7 @@ + # Aesthetically quote the argument. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac +@@ -5343,13 +5809,13 @@ + if test -z "$install_prog"; then + $echo "$modename: you must specify an install program" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$prev"; then + $echo "$modename: the \`$prev' option requires an argument" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -z "$files"; then +@@ -5359,7 +5825,7 @@ + $echo "$modename: you must specify a destination" 1>&2 + fi + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Strip any trailing slash from the destination. +@@ -5380,7 +5846,7 @@ + if test "$#" -gt 2; then + $echo "$modename: \`$dest' is not a directory" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + case $destdir in +@@ -5392,7 +5858,7 @@ + *) + $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + done +@@ -5421,7 +5887,7 @@ + else + $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + library_names= +@@ -5463,7 +5929,7 @@ + # but it's something to keep an eye on. + if test "$inst_prefix_dir" = "$destdir"; then + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + if test -n "$inst_prefix_dir"; then +@@ -5478,7 +5944,7 @@ + if $run eval "$relink_command"; then : + else + $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi + +@@ -5502,23 +5968,36 @@ + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. ++ # Try `ln -sf' first, because the `ln' binary might depend on ++ # the symlink we replace! Solaris /bin/ln does not understand -f, ++ # so we also need to try rm && ln -s. + for linkname + do + if test "$linkname" != "$realname"; then +- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" +- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" ++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" ++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" + fi + done + fi + + # Do each command in the postinstall commands. + lib="$destdir/$realname" +- eval cmds=\"$postinstall_cmds\" ++ cmds=$postinstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" +- $run eval "$cmd" || exit $? ++ $run eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi ++ ++ exit $lt_exit ++ } + done + IFS="$save_ifs" + fi +@@ -5556,7 +6035,7 @@ + *) + $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -5574,7 +6053,7 @@ + $show "$install_prog $staticobj $staticdest" + $run eval "$install_prog \$staticobj \$staticdest" || exit $? + fi +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + *) +@@ -5612,23 +6091,21 @@ + notinst_deplibs= + relink_command= + +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # + # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; + esac + + # Check the variables that should have been set. + if test -z "$notinst_deplibs"; then + $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + finalize=yes +@@ -5650,30 +6127,21 @@ + done + + relink_command= +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # + # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; + esac + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + if test "$finalize" = yes && test -z "$run"; then +- tmpdir="/tmp" +- test -n "$TMPDIR" && tmpdir="$TMPDIR" +- tmpdir="$tmpdir/libtool-$$" +- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then : +- else +- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 +- continue +- fi ++ tmpdir=`func_mktempdir` + file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` + outputname="$tmpdir/$file" + # Replace the output file specification. +@@ -5697,7 +6165,7 @@ + fi + + # remove .exe since cygwin /usr/bin/install will append another +- # one anyways ++ # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in +@@ -5729,16 +6197,17 @@ + $show "$install_prog $file $oldlib" + $run eval "$install_prog \$file \$oldlib" || exit $? + +- if test -n "$stripme" && test -n "$striplib"; then ++ if test -n "$stripme" && test -n "$old_striplib"; then + $show "$old_striplib $oldlib" + $run eval "$old_striplib $oldlib" || exit $? + fi + + # Do each command in the postinstall commands. +- eval cmds=\"$old_postinstall_cmds\" ++ cmds=$old_postinstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -5752,9 +6221,9 @@ + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + test -n "$run" && current_libdirs=" -n$current_libdirs" +- exec_cmd='$SHELL $0 --finish$current_libdirs' ++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else +- exit 0 ++ exit $EXIT_SUCCESS + fi + ;; + +@@ -5773,10 +6242,11 @@ + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +- eval cmds=\"$finish_cmds\" ++ cmds=$finish_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" || admincmds="$admincmds + $cmd" +@@ -5793,9 +6263,9 @@ + fi + + # Exit here if they wanted silent mode. +- exit 0 ++ test "$show" = : && exit $EXIT_SUCCESS + +- $echo "----------------------------------------------------------------------" ++ $echo "X----------------------------------------------------------------------" | $Xsed + $echo "Libraries have been installed in:" + for libdir in $libdirs; do + $echo " $libdir" +@@ -5828,8 +6298,8 @@ + $echo + $echo "See any operating system documentation about shared libraries for" + $echo "more information, such as the ld(1) and ld.so(8) manual pages." +- $echo "----------------------------------------------------------------------" +- exit 0 ++ $echo "X----------------------------------------------------------------------" | $Xsed ++ exit $EXIT_SUCCESS + ;; + + # libtool execute mode +@@ -5841,7 +6311,7 @@ + if test -z "$cmd"; then + $echo "$modename: you must specify a COMMAND" 1>&2 + $echo "$help" +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Handle -dlopen flags immediately. +@@ -5849,7 +6319,7 @@ + if test ! -f "$file"; then + $echo "$modename: \`$file' is not a file" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + dir= +@@ -5860,7 +6330,7 @@ + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + # Read the libtool library. +@@ -5887,7 +6357,7 @@ + dir="$dir/$objdir" + else + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + ;; + +@@ -5967,7 +6437,7 @@ + $echo "export $shlibpath_var" + fi + $echo "$cmd$args" +- exit 0 ++ exit $EXIT_SUCCESS + fi + ;; + +@@ -5995,7 +6465,7 @@ + if test -z "$rm"; then + $echo "$modename: you must specify an RM program" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + + rmdirs= +@@ -6045,15 +6515,24 @@ + rmfiles="$rmfiles $objdir/$n" + done + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" +- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + +- if test "$mode" = uninstall; then ++ case "$mode" in ++ clean) ++ case " $library_names " in ++ # " " in the beginning catches empty $dlname ++ *" $dlname "*) ;; ++ *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ esac ++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ ;; ++ uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. +- eval cmds=\"$postuninstall_cmds\" ++ cmds=$postuninstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then +@@ -6065,10 +6544,11 @@ + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. +- eval cmds=\"$old_postuninstall_cmds\" ++ cmds=$old_postuninstall_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" ++ eval cmd=\"$cmd\" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then +@@ -6078,7 +6558,8 @@ + IFS="$save_ifs" + fi + # FIXME: should reinstall the best remaining shared library. +- fi ++ ;; ++ esac + fi + ;; + +@@ -6107,7 +6588,7 @@ + if test "$mode" = clean ; then + noexename=$name + case $file in +- *.exe) ++ *.exe) + file=`$echo $file|${SED} 's,.exe$,,'` + noexename=`$echo $name|${SED} 's,.exe$,,'` + # $file with .exe has already been added to rmfiles, +@@ -6152,20 +6633,20 @@ + "") + $echo "$modename: you must specify a MODE" 1>&2 + $echo "$generic_help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + if test -z "$exec_cmd"; then + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$generic_help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + fi + fi # test -z "$show_help" + + if test -n "$exec_cmd"; then + eval exec $exec_cmd +- exit 1 ++ exit $EXIT_FAILURE + fi + + # We need to display help for each of the modes. +@@ -6201,7 +6682,7 @@ + a more detailed description of MODE. + + Report bugs to ." +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + clean) +@@ -6313,6 +6794,8 @@ + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects ++ -precious-files-regex REGEX ++ don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries +@@ -6354,14 +6837,14 @@ + *) + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$help" 1>&2 +- exit 1 ++ exit $EXIT_FAILURE + ;; + esac + + $echo + $echo "Try \`$modename --help' for more information about other modes." + +-exit 0 ++exit $? + + # The TAGs below are defined such that we never get into a situation + # in which we disable both kinds of libraries. Given conflicting +@@ -6375,12 +6858,11 @@ + # configuration. But we'll never go from static-only to shared-only. + + # ### BEGIN LIBTOOL TAG CONFIG: disable-shared +-build_libtool_libs=no +-build_old_libs=yes ++disable_libs=shared + # ### END LIBTOOL TAG CONFIG: disable-shared + + # ### BEGIN LIBTOOL TAG CONFIG: disable-static +-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` ++disable_libs=static + # ### END LIBTOOL TAG CONFIG: disable-static + + # Local Variables: --- kdebase-3.5.6.orig/debian/patches/kubuntu_12_hide_krandrtray_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_12_hide_krandrtray_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kcontrol/randr/krandrtray.desktop-orig 2005-03-17 01:29:05.930232104 +0000 ++++ kdebase/kcontrol/randr/krandrtray.desktop 2005-03-17 01:29:12.431243800 +0000 +@@ -98,3 +98,4 @@ + Type=Application + OnlyShowIn=KDE; + Categories=Qt;KDE;System; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff +++ kdebase-3.5.6/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff @@ -0,0 +1,7 @@ +--- kdebase/kappfinder/kappfinder.desktop 2005-03-17 01:08:26.659629872 +0000 ++++ kdebase/kappfinder/kappfinder.desktop 2005-03-17 01:08:34.189485160 +0000 +@@ -64,3 +64,4 @@ + Name[zh_CN]=èœå•æ›´æ–°å·¥å…· + X-DCOP-ServiceType=Multi + Categories=Qt;KDE;Settings; ++NoDisplay=true --- kdebase-3.5.6.orig/debian/patches/13_kdm_sessions_fixes.diff +++ kdebase-3.5.6/debian/patches/13_kdm_sessions_fixes.diff @@ -0,0 +1,65 @@ +--- kde.orig/kdm/kfrontend/sessions/matchbox.desktop ++++ kde.patched/kdm/kfrontend/sessions/matchbox.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec=matchbox +-TryExec=matchbox ++Exec=matchbox-window-manager ++TryExec=matchbox-window-manager + Name=Matchbox + Name[bn]=মà§à¦¯à¦¾à¦šà¦¬à¦•à§à¦¸ + Name[eo]=Alumetujo +--- kde.orig/kdm/kfrontend/sessions/olvwm.desktop ++++ kde.patched/kdm/kfrontend/sessions/olvwm.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec= +-TryExec= ++Exec=olvwm-x-window-manager ++TryExec=olvwm-x-window-manager + Name=OLVWM + Name[br]=OVLWM + Name[eo]=OLVFA +--- kde.orig/kdm/kfrontend/sessions/pwm.desktop ++++ kde.patched/kdm/kfrontend/sessions/pwm.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec=pwm +-TryExec=pwm ++Exec=pwm1 ++TryExec=pwm1 + Name=PWM + Name[eo]=UnuFA + Name[hi]=पीडबलà¥à¤¯à¥‚à¤à¤® +--- kde.orig/kdm/kfrontend/sessions/ude.desktop ++++ kde.patched/kdm/kfrontend/sessions/ude.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec=ude +-TryExec=ude ++Exec=uwm ++TryExec=uwm + Name=UDE + Name[eo]=ULĈ + Name[hi]=यूडीई +--- kde.orig/kdm/kfrontend/sessions/olwm.desktop ++++ kde.patched/kdm/kfrontend/sessions/olwm.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec=olwm +-TryExec=olwm ++Exec=olwm-x-window-manager ++TryExec=olwm-x-window-manager + Name=OLWM + Name[eo]=OLFA + Name[hi]=ओà¤à¤²à¤¡à¤¬à¤²à¥à¤¯à¥‚à¤à¤® --- kdebase-3.5.6.orig/debian/patches/kubuntu_73_nomediaioslave_mounthelper.diff +++ kdebase-3.5.6/debian/patches/kubuntu_73_nomediaioslave_mounthelper.diff @@ -0,0 +1,606 @@ +--- kdebase-3.5.5_orig/kioslave/media/libmediacommon/notifieraction.cpp 2005-10-10 17:04:00.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/libmediacommon/notifieraction.cpp 2006-10-17 19:51:01.000000000 +0200 +@@ -23,6 +23,9 @@ + #include + #include + #include ++#include ++#include ++#include + + NotifierAction::NotifierAction() + { +@@ -95,3 +98,98 @@ + return true; + } + ++KURL NotifierAction::ensureMediumMounted(const QString &devNodeName, bool &ok) ++{ ++ ok = false; ++ ++ // We get the mount/media information from the KDE mediamanager, the ++ // same way as what the media:/ ioslave does. ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "fullList" ); ++ if ( !reply.isValid() ) ++ { ++ return KURL(); ++ } ++ ++ Medium::List mediumList = Medium::createList(reply); ++ Medium::List::iterator it = mediumList.begin(); ++ Medium::List::iterator end = mediumList.end(); ++ ++ Medium thisMedium(QString::null,QString::null); ++ ++ for(; it!=end; ++it) ++ { ++ if( (*it).name()==devNodeName) ++ { ++ thisMedium = *it; ++ break; ++ } ++ } ++ if( it==end) ++ { ++ // Couldn't find the medium entry. Sorry. ++ return KURL(); ++ } ++ ++ // Try mounting this medium. ++ if ( thisMedium.needMounting() ) ++ { ++ m_lastErrorCode = 0; ++ ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "mount", thisMedium.id()); ++ if (reply.isValid()) ++ { ++ reply.get(m_lastErrorMessage); ++ } ++ else ++ { ++ m_lastErrorMessage = i18n("Internal Error"); ++ } ++ ++ if (!m_lastErrorMessage.isEmpty()) ++ { ++ m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; ++ } ++ ++ bool ok; ++ thisMedium = findMediumByName(thisMedium.name(), ok); ++ if ( m_lastErrorCode!=0 ) ++ { ++ return KURL(); // failed ++ } ++ } ++ ++ KURL thisUrl; ++ if(thisMedium.mountPoint()!=QString::null && !thisMedium.baseURL().startsWith("audiocd:") ++ && !thisMedium.baseURL().startsWith("camera:")) ++ { ++ thisUrl = KURL(thisMedium.mountPoint()); ++ } ++ else ++ { ++ thisUrl = KURL(thisMedium.baseURL()); ++ } ++ ++ ok = true; ++ return thisUrl; ++} ++ ++const Medium NotifierAction::findMediumByName(const QString &name, bool &ok) ++{ ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "properties", name ); ++ ++ if ( reply.isValid() ) ++ { ++ ok = true; ++ } ++ else ++ { ++ m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; ++ m_lastErrorMessage = i18n("The KDE mediamanager is not running."); ++ ok = false; ++ } ++ ++ return Medium::create(reply); ++} +--- kdebase-3.5.5_orig/kioslave/media/libmediacommon/notifieraction.h 2005-10-10 17:04:00.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/libmediacommon/notifieraction.h 2006-10-16 23:33:46.000000000 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include "medium.h" + + class NotifierSettings; + +@@ -46,6 +47,13 @@ + virtual bool supportsMimetype( const QString &mimetype ) const; + virtual void execute( KFileItem &medium ) = 0; + ++protected: ++ KURL ensureMediumMounted(const QString &devNodeName, bool &ok); ++ const Medium findMediumByName(const QString &name, bool &ok); ++ ++ int m_lastErrorCode; ++ QString m_lastErrorMessage; ++ + private: + void addAutoMimetype( const QString &mimetype ); + void removeAutoMimetype( const QString &mimetype ); +@@ -54,6 +62,7 @@ + QString m_iconName; + QStringList m_autoMimetypes; + ++ + friend class NotifierSettings; + }; + +--- kdebase-3.5.5_orig/kioslave/media/libmediacommon/notifiernothingaction.cpp 2005-10-10 17:04:00.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/libmediacommon/notifiernothingaction.cpp 2006-10-16 23:33:46.000000000 +0200 +@@ -33,7 +33,10 @@ + return "#NothinAction"; + } + +-void NotifierNothingAction::execute(KFileItem &/*medium*/) ++void NotifierNothingAction::execute(KFileItem &medium) + { ++ // Quietly mount this medium. ++ bool ok; ++ ensureMediumMounted(medium.url().fileName(), ok); + } + +--- kdebase-3.5.5_orig/kioslave/media/libmediacommon/notifieropenaction.cpp 2005-11-08 23:36:07.000000000 +0100 ++++ kdebase-3.5.5/kioslave/media/libmediacommon/notifieropenaction.cpp 2006-10-16 23:33:46.000000000 +0200 +@@ -20,6 +20,7 @@ + #include "notifieropenaction.h" + + #include ++#include + + NotifierOpenAction::NotifierOpenAction() + : NotifierAction() +@@ -35,11 +36,15 @@ + + void NotifierOpenAction::execute(KFileItem &medium) + { +- medium.run(); ++ bool ok; ++ KURL thisUrl = ensureMediumMounted(medium.url().fileName(), ok); ++ if ( ok ) ++ { ++ new KRun(thisUrl); ++ } + } + + bool NotifierOpenAction::supportsMimetype( const QString &mimetype ) const + { + return !mimetype.contains( "blank" ); + } +- +--- kdebase-3.5.5_orig/kioslave/media/mediamanager/halbackend.cpp 2006-10-01 19:31:54.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/mediamanager/halbackend.cpp 2006-10-16 23:33:46.000000000 +0200 +@@ -429,12 +429,30 @@ + medium->setName( + generateName(libhal_volume_get_device_file(halVolume)) ); + ++ const char *halMp = libhal_volume_get_mount_point(halVolume); ++ + medium->mountableState( + libhal_volume_get_device_file(halVolume), /* Device node */ +- libhal_volume_get_mount_point(halVolume), /* Mount point */ ++ halMp, /* Mount point */ + libhal_volume_get_fstype(halVolume), /* Filesystem type */ + libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ + ++ // This is kind of workaround for the feature that HAL won't tell you nor ++ // recommend a mountpoint for anything that is not yet mounted. A hint ++ // would be nice. --SBE ++ if(halMp==0) ++ { ++ QString newMp = getMountPointFromFstab(medium->deviceNode()); ++ ++ if (!newMp.isNull() ) ++ { ++ medium->mountableState(medium->deviceNode(),/* Device node */ ++ newMp, /* Mount point */ ++ medium->fsType(), /* Filesystem type */ ++ medium->isMounted()); /* Mounted ? */ ++ } ++ } ++ + char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); + QString volume_name = QString::fromUtf8(name); + QString media_name = volume_name; +@@ -1004,6 +1023,24 @@ + return QString::null; + } + ++QString HALBackend::getMountPointFromFstab(const QString &deviceNode) ++{ ++ KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedRealDeviceName); ++ ++ KMountPoint::List::iterator it = fstab.begin(); ++ KMountPoint::List::iterator end = fstab.end(); ++ ++ for (; it!=end; ++it) ++ { ++ if ((*it)->mountedFrom() == deviceNode || ( !deviceNode.isEmpty() && (*it)->realDeviceName() == deviceNode ) ) ++ { ++ return (*it)->mountPoint(); ++ } ++ } ++ ++ return QString::null; ++} ++ + QString HALBackend::mount(const Medium *medium) + { + if (medium->isMounted()) +--- kdebase-3.5.5_orig/kioslave/media/mediamanager/halbackend.h 2006-07-22 10:15:45.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/mediamanager/halbackend.h 2006-10-16 23:33:46.000000000 +0200 +@@ -152,6 +152,7 @@ + QString generateName(const QString &devNode); + static QString isInFstab(const Medium *medium); + static QString listUsingProcesses(const Medium *medium); ++ static QString getMountPointFromFstab(const QString &deviceNode); + + private slots: + void slotResult(KIO::Job *job); +--- kdebase-3.5.5_orig/kioslave/media/mediamanager/mediamanager.cpp 2006-10-01 19:31:54.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/mediamanager/mediamanager.cpp 2006-10-18 22:37:44.000000000 +0200 +@@ -43,6 +43,9 @@ + MediaManager::MediaManager(const QCString &obj) + : KDEDModule(obj), m_dirNotify(m_mediaList) + { ++//fprintf(stderr,"MediaManager::MediaManager()\n"); ++//fflush(stderr); ++ + connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), + SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); + connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), +@@ -52,6 +55,8 @@ + SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); + + QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); ++//fprintf(stderr,"MediaManager::MediaManager() done\n"); ++//fflush(stderr); + } + + MediaManager::~MediaManager() +@@ -66,6 +71,8 @@ + + void MediaManager::loadBackends() + { ++//fprintf(stderr,"MediaManager::loadBackends()\n"); ++//fflush(stderr); + m_mediaList.blockSignals(true); + + while ( !m_backends.isEmpty() ) +@@ -113,11 +120,15 @@ + m_fstabbackend = new FstabBackend(m_mediaList); + m_backends.append( m_fstabbackend ); + m_mediaList.blockSignals(false); ++//fprintf(stderr,"MediaManager::loadBackends() done\n"); ++//fflush(stderr); + } + + + QStringList MediaManager::fullList() + { ++//fprintf(stderr,"MediaManager::fullList()\n"); ++//fflush(stderr); + QPtrList list = m_mediaList.list(); + + QStringList result; +@@ -130,6 +141,8 @@ + result+= Medium::SEPARATOR; + } + ++//fprintf(stderr,"MediaManager::fullList() done\n"); ++//fflush(stderr); + return result; + } + +@@ -290,6 +303,8 @@ + bool allowNotification) + { + kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; ++fprintf(stderr,"MediaManager::slotMediumAdded: %s\n",name.latin1()); ++fflush(stderr); + + KDirNotify_stub notifier("*", "*"); + notifier.FilesAdded( KURL("media:/") ); +@@ -302,6 +317,8 @@ + bool allowNotification) + { + kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; ++fprintf(stderr,"MediaManager::slotMediumRemoved: %s\n",name.latin1()); ++fflush(stderr); + + KDirNotify_stub notifier("*", "*"); + notifier.FilesRemoved( KURL("media:/"+name) ); +@@ -314,6 +331,8 @@ + bool mounted, bool allowNotification) + { + kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; ++fprintf(stderr,"MediaManager::slotMediumChanged: %s\n",name.latin1()); ++fflush(stderr); + + KDirNotify_stub notifier("*", "*"); + if (!mounted) +@@ -321,7 +340,23 @@ + notifier.FilesRemoved( KURL("media:/"+name) ); + } + notifier.FilesChanged( KURL("media:/"+name) ); +- ++/* ++ const Medium *changeMedium = m_mediaList.findByName(name); ++ if ( changeMedium ) ++ { ++fprintf(stderr,"MediaManager::slotMediumChanged: checkpoint 1\n"); ++fflush(stderr); ++ // Notify that the mountpoint dir properties have changed. ++ if ( changeMedium->mountPoint()!=QString::null && changeMedium->mountPoint()!="") ++ { ++fprintf(stderr,"MediaManager::slotMediumChanged: checkpoint 2 %s\n",changeMedium->mountPoint().latin1()); ++fflush(stderr); ++ notifier.FilesChanged( KURL(QString("file:/")+changeMedium->mountPoint()) ); ++ } ++ } ++fprintf(stderr,"MediaManager::slotMediumChanged: checkpoint 3\n"); ++fflush(stderr); ++*/ + emit mediumChanged(name, allowNotification); + emit mediumChanged(name); + } +--- kdebase-3.5.5_orig/kioslave/media/medianotifier/medianotifier.cpp 2006-10-01 19:31:53.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/medianotifier/medianotifier.cpp 2006-10-16 23:33:46.000000000 +0200 +@@ -31,6 +31,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include "notificationdialog.h" + #include "notifiersettings.h" +@@ -39,11 +42,16 @@ + + MediaNotifier::MediaNotifier(const QCString &name) : KDEDModule(name) + { ++//fprintf(stderr,"MediaNotifier::MediaNotifier()\n"); ++//fflush(stderr); + connectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", + "onMediumChange(QString, bool)", true ); + + connectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", + "onMediumChange(QString, bool)", true ); ++//fprintf(stderr,"MediaNotifier::MediaNotifier() done\n"); ++//fflush(stderr); ++ automountRemovables(); + } + + MediaNotifier::~MediaNotifier() +@@ -55,21 +63,67 @@ + "onMediumChange(QString, bool)" ); + } + ++void MediaNotifier::automountRemovables() { ++ ++ // We get the mount/media information from the KDE mediamanager, the ++ // same way as what the media:/ ioslave does. ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "fullList" ); ++if ( !reply.isValid() ) ++ { ++ return; ++ } ++ ++ Medium::List mediumList = Medium::createList(reply); ++ Medium::List::iterator it = mediumList.begin(); ++ Medium::List::iterator end = mediumList.end(); ++ ++ Medium thisMedium(QString::null,QString::null); ++ ++ for(; it!=end; ++it) ++ { ++ QString mimeType = (*it).mimeType(); ++ if( mimeType=="media/cdrom_unmounted" || ++ mimeType=="media/cdwriter_unmounted" || ++ mimeType=="media/dvd_unmounted" || ++ mimeType=="media/zip_unmounted" || ++ mimeType=="media/removable_unmounted") ++ { ++ // Try mounting this medium. ++ if ( (*it).needMounting() ) ++ { ++ DCOPRef mediamanager("kded", "mediamanager"); ++ DCOPReply reply = mediamanager.call( "mount", (*it).id()); ++ } ++ } ++ } ++} ++ + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) + { + kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " + << allowNotification << ")" << endl; + ++//fprintf(stderr,"MediaNotifier::onMediumChange(%s)\n",name.latin1()); ++//fflush(stderr); ++ + if ( !allowNotification ) +- return; ++ return; + + // Update user activity timestamp, otherwise the notification dialog will be shown + // in the background due to focus stealing prevention. Entering a new media can + // be seen as a kind of user activity after all. It'd be better to update the timestamp + // as soon as the media is entered, but it apparently takes some time to get here. ++ + kapp->updateUserTimestamp(); + +- KURL url( "system:/media/"+name ); ++//fprintf(stderr,"MediaNotifier::onMediumChange url is now %s\n",thisMedium.mountPoint().latin1()); ++//fflush(stderr); ++ ++ KURL url( "media:/"+name ); ++ ++//fprintf(stderr,"MediaNotifier::onMediumChange checkpoint 2\n"); ++//fflush(stderr); + + KIO::SimpleJob *job = KIO::stat( url, false ); + job->setInteractive( false ); +--- kdebase-3.5.5_orig/kioslave/media/medianotifier/medianotifier.h 2005-10-10 17:04:00.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/medianotifier/medianotifier.h 2006-10-16 23:33:46.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include "medium.h" + + class MediaNotifier: public KDEDModule + { +@@ -50,7 +51,8 @@ + const QString &autorunFile ); + bool execAutoopen( const KFileItem &medium, const QString &path, + const QString &autoopenFile ); +- ++ void automountRemovables(); ++ + QMap m_allowNotificationMap; + }; + #endif +--- kdebase-3.5.5_orig/kioslave/media/medianotifier/notificationdialog.h 2005-10-10 17:04:00.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/medianotifier/notificationdialog.h 2006-10-18 19:06:14.000000000 +0200 +@@ -40,6 +40,7 @@ + + private slots: + void slotOk(); ++ void slotCancel(); + void slotConfigure(); + void slotActionsChanged(const QString& dir); + +--- kdebase-3.5.5_orig/kioslave/media/medianotifier/notificationdialog.cpp 2006-10-07 16:23:12.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/medianotifier/notificationdialog.cpp 2006-10-18 19:09:25.000000000 +0200 +@@ -30,6 +30,7 @@ + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" ++#include "notifiernothingaction.h" + + NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *settings, + QWidget* parent, const char* name ) +@@ -121,6 +122,12 @@ + } + } + ++void NotificationDialog::slotCancel() ++{ ++ NotifierNothingAction nothingAction; ++ launchAction(¬hingAction); ++} ++ + void NotificationDialog::launchAction( NotifierAction *action ) + { + if ( m_view->autoActionCheck->isChecked() ) +--- kdebase-3.5.5_orig/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2006-07-22 10:15:42.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2006-10-18 22:36:24.000000000 +0200 +@@ -37,26 +37,39 @@ + + const Medium MountHelper::findMedium(const KURL &url) + { ++ // Grab all of the mount point data from the mediamanager + DCOPRef mediamanager("kded", "mediamanager"); + + // Try filename first +- DCOPReply reply = mediamanager.call( "properties", url.fileName() ); ++ DCOPReply reply = mediamanager.call( "fullList" ); + if ( !reply.isValid() ) { + m_errorStr = i18n("The KDE mediamanager is not running.")+"\n"; + return Medium(QString::null, QString::null); + } +- const Medium& medium = Medium::create(reply); +- if ( medium.id().isEmpty() ) { +- // Try full URL now +- reply = mediamanager.call( "properties", url.prettyURL() ); +- if ( !reply.isValid() ) { +- m_errorStr = i18n("Internal Error"); +- return Medium(QString::null, QString::null); +- } +- return Medium::create(reply); ++ Medium::List mediumList = Medium::createList(reply); ++ Medium::List::iterator it = mediumList.begin(); ++ Medium::List::iterator end = mediumList.end(); ++ ++ Medium thisMedium(QString::null,QString::null); ++ QString key; ++ if ( url.protocol()=="system" || url.protocol()=="media" ) { ++ key = url.fileName(); + } else { +- return medium; ++ if ( url.protocol()=="audiocd" || url.protocol()=="camera") { ++ key = url.url(); ++ } else { ++ key = url.path(); ++ } ++ } ++ ++ for(; it!=end; ++it) { ++ if( ((*it).name()==key) || ((*it).deviceNode()==key) || ((*it).mountPoint()==key) || ((*it).baseURL()==key) ) { ++ return *it; ++ } + } ++ ++ // Failure ++ return Medium::Medium("",""); + } + + MountHelper::MountHelper() : KApplication() +@@ -66,6 +79,15 @@ + m_errorStr = ""; + + KURL url(args->url(0)); ++ QString arg1(args->arg(0)); ++ // An argument like "hdb" gets translated to file://home/user/hdb ++ // We don't want that. We want file://hdb, then later we can grab the ++ // path (hdb) and use that to identify the device. ++ if ( url.protocol()=="file" && !arg1.startsWith("/") ) ++ { ++ url.setPath(arg1); ++ } ++ + const Medium medium = findMedium(url); + + if ( medium.id().isEmpty() ) +--- kdebase-3.5.5_orig/kioslave/media/services/media_unmount.desktop 2006-05-23 13:33:34.000000000 +0200 ++++ kdebase-3.5.5/kioslave/media/services/media_unmount.desktop 2006-10-16 23:58:44.000000000 +0200 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo ++ServiceTypes=media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo + Actions=MediaUnmount; + X-KDE-Priority=TopLevel + X-KDE-MediaNotifierHide=true +--- kdebase-3.5.5_orig/konqueror/about/launch.html 2006-09-28 14:39:37.000000000 +0200 ++++ kdebase-3.5.5.new/konqueror/about/launch.html 2006-09-28 14:41:17.000000000 +0200 +@@ -82,10 +82,10 @@ + %1
%1 + 		+- ++ + +- %1
%1 ++ %1
%1 +