--- amarok-1.4.3.orig/po/af/Makefile.in +++ amarok-1.4.3/po/af/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/af/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/af/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/af/Makefile +#>- $(AUTOMAKE) --foreign po/af/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/af/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/af/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/af/Makefile + $(AUTOMAKE) --foreign po/af/Makefile cd $(top_srcdir) && perl admin/am_edit po/af/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/af/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/af/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/af/Makefile + $(AUTOMAKE) --foreign po/af/Makefile cd $(top_srcdir) && perl admin/am_edit po/af/Makefile.in --- amarok-1.4.3.orig/po/ar/Makefile.in +++ amarok-1.4.3/po/ar/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ar/Makefile +#>- $(AUTOMAKE) --foreign po/ar/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ar/Makefile + $(AUTOMAKE) --foreign po/ar/Makefile cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ar/Makefile + $(AUTOMAKE) --foreign po/ar/Makefile cd $(top_srcdir) && perl admin/am_edit po/ar/Makefile.in --- amarok-1.4.3.orig/po/bg/Makefile.in +++ amarok-1.4.3/po/bg/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bg/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bg/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/bg/Makefile +#>- $(AUTOMAKE) --foreign po/bg/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/bg/Makefile + $(AUTOMAKE) --foreign po/bg/Makefile cd $(top_srcdir) && perl admin/am_edit po/bg/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/bg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/bg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/bg/Makefile + $(AUTOMAKE) --foreign po/bg/Makefile cd $(top_srcdir) && perl admin/am_edit po/bg/Makefile.in --- amarok-1.4.3.orig/po/ca/Makefile.in +++ amarok-1.4.3/po/ca/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ca/Makefile +#>- $(AUTOMAKE) --foreign po/ca/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ca/Makefile + $(AUTOMAKE) --foreign po/ca/Makefile cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ca/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ca/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ca/Makefile + $(AUTOMAKE) --foreign po/ca/Makefile cd $(top_srcdir) && perl admin/am_edit po/ca/Makefile.in --- amarok-1.4.3.orig/po/az/Makefile.in +++ amarok-1.4.3/po/az/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/az/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/az/Makefile +#>- $(AUTOMAKE) --foreign po/az/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/az/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/az/Makefile + $(AUTOMAKE) --foreign po/az/Makefile cd $(top_srcdir) && perl admin/am_edit po/az/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/az/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/az/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/az/Makefile + $(AUTOMAKE) --foreign po/az/Makefile cd $(top_srcdir) && perl admin/am_edit po/az/Makefile.in --- amarok-1.4.3.orig/po/br/Makefile.in +++ amarok-1.4.3/po/br/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/br/Makefile +#>- $(AUTOMAKE) --foreign po/br/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/br/Makefile + $(AUTOMAKE) --foreign po/br/Makefile cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/br/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/br/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/br/Makefile + $(AUTOMAKE) --foreign po/br/Makefile cd $(top_srcdir) && perl admin/am_edit po/br/Makefile.in --- amarok-1.4.3.orig/po/da/Makefile.in +++ amarok-1.4.3/po/da/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/da/Makefile +#>- $(AUTOMAKE) --foreign po/da/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/da/Makefile + $(AUTOMAKE) --foreign po/da/Makefile cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/da/Makefile + $(AUTOMAKE) --foreign po/da/Makefile cd $(top_srcdir) && perl admin/am_edit po/da/Makefile.in --- amarok-1.4.3.orig/po/de/Makefile.in +++ amarok-1.4.3/po/de/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/de/Makefile +#>- $(AUTOMAKE) --foreign po/de/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/de/Makefile + $(AUTOMAKE) --foreign po/de/Makefile cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/de/Makefile + $(AUTOMAKE) --foreign po/de/Makefile cd $(top_srcdir) && perl admin/am_edit po/de/Makefile.in --- amarok-1.4.3.orig/po/cs/Makefile.in +++ amarok-1.4.3/po/cs/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/cs/Makefile +#>- $(AUTOMAKE) --foreign po/cs/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cs/Makefile + $(AUTOMAKE) --foreign po/cs/Makefile cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cs/Makefile + $(AUTOMAKE) --foreign po/cs/Makefile cd $(top_srcdir) && perl admin/am_edit po/cs/Makefile.in --- amarok-1.4.3.orig/po/cy/Makefile.in +++ amarok-1.4.3/po/cy/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/cy/Makefile +#>- $(AUTOMAKE) --foreign po/cy/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cy/Makefile + $(AUTOMAKE) --foreign po/cy/Makefile cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/cy/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/cy/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/cy/Makefile + $(AUTOMAKE) --foreign po/cy/Makefile cd $(top_srcdir) && perl admin/am_edit po/cy/Makefile.in --- amarok-1.4.3.orig/po/el/Makefile.in +++ amarok-1.4.3/po/el/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/el/Makefile +#>- $(AUTOMAKE) --foreign po/el/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/el/Makefile + $(AUTOMAKE) --foreign po/el/Makefile cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/el/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/el/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/el/Makefile + $(AUTOMAKE) --foreign po/el/Makefile cd $(top_srcdir) && perl admin/am_edit po/el/Makefile.in --- amarok-1.4.3.orig/po/es/Makefile.in +++ amarok-1.4.3/po/es/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/es/Makefile +#>- $(AUTOMAKE) --foreign po/es/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/es/Makefile + $(AUTOMAKE) --foreign po/es/Makefile cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/es/Makefile + $(AUTOMAKE) --foreign po/es/Makefile cd $(top_srcdir) && perl admin/am_edit po/es/Makefile.in --- amarok-1.4.3.orig/po/et/Makefile.in +++ amarok-1.4.3/po/et/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/et/Makefile +#>- $(AUTOMAKE) --foreign po/et/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/et/Makefile + $(AUTOMAKE) --foreign po/et/Makefile cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/et/Makefile + $(AUTOMAKE) --foreign po/et/Makefile cd $(top_srcdir) && perl admin/am_edit po/et/Makefile.in --- amarok-1.4.3.orig/po/fi/Makefile.in +++ amarok-1.4.3/po/fi/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/fi/Makefile +#>- $(AUTOMAKE) --foreign po/fi/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fi/Makefile + $(AUTOMAKE) --foreign po/fi/Makefile cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fi/Makefile + $(AUTOMAKE) --foreign po/fi/Makefile cd $(top_srcdir) && perl admin/am_edit po/fi/Makefile.in --- amarok-1.4.3.orig/po/ga/Makefile.in +++ amarok-1.4.3/po/ga/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ga/Makefile +#>- $(AUTOMAKE) --foreign po/ga/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ga/Makefile + $(AUTOMAKE) --foreign po/ga/Makefile cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ga/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ga/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ga/Makefile + $(AUTOMAKE) --foreign po/ga/Makefile cd $(top_srcdir) && perl admin/am_edit po/ga/Makefile.in --- amarok-1.4.3.orig/po/fr/Makefile.in +++ amarok-1.4.3/po/fr/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/fr/Makefile +#>- $(AUTOMAKE) --foreign po/fr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fr/Makefile + $(AUTOMAKE) --foreign po/fr/Makefile cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/fr/Makefile + $(AUTOMAKE) --foreign po/fr/Makefile cd $(top_srcdir) && perl admin/am_edit po/fr/Makefile.in --- amarok-1.4.3.orig/po/gl/Makefile.in +++ amarok-1.4.3/po/gl/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/gl/Makefile +#>- $(AUTOMAKE) --foreign po/gl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/gl/Makefile + $(AUTOMAKE) --foreign po/gl/Makefile cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/gl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/gl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/gl/Makefile + $(AUTOMAKE) --foreign po/gl/Makefile cd $(top_srcdir) && perl admin/am_edit po/gl/Makefile.in --- amarok-1.4.3.orig/po/he/Makefile.in +++ amarok-1.4.3/po/he/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/he/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/he/Makefile +#>- $(AUTOMAKE) --foreign po/he/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/he/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/he/Makefile + $(AUTOMAKE) --foreign po/he/Makefile cd $(top_srcdir) && perl admin/am_edit po/he/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/he/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/he/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/he/Makefile + $(AUTOMAKE) --foreign po/he/Makefile cd $(top_srcdir) && perl admin/am_edit po/he/Makefile.in --- amarok-1.4.3.orig/po/hi/Makefile.in +++ amarok-1.4.3/po/hi/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hi/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/hi/Makefile +#>- $(AUTOMAKE) --foreign po/hi/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hi/Makefile + $(AUTOMAKE) --foreign po/hi/Makefile cd $(top_srcdir) && perl admin/am_edit po/hi/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hi/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hi/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hi/Makefile + $(AUTOMAKE) --foreign po/hi/Makefile cd $(top_srcdir) && perl admin/am_edit po/hi/Makefile.in --- amarok-1.4.3.orig/po/hu/Makefile.in +++ amarok-1.4.3/po/hu/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/hu/Makefile +#>- $(AUTOMAKE) --foreign po/hu/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hu/Makefile + $(AUTOMAKE) --foreign po/hu/Makefile cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/hu/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/hu/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/hu/Makefile + $(AUTOMAKE) --foreign po/hu/Makefile cd $(top_srcdir) && perl admin/am_edit po/hu/Makefile.in --- amarok-1.4.3.orig/po/ja/Makefile.in +++ amarok-1.4.3/po/ja/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ja/Makefile +#>- $(AUTOMAKE) --foreign po/ja/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ja/Makefile + $(AUTOMAKE) --foreign po/ja/Makefile cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ja/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ja/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ja/Makefile + $(AUTOMAKE) --foreign po/ja/Makefile cd $(top_srcdir) && perl admin/am_edit po/ja/Makefile.in --- amarok-1.4.3.orig/po/is/Makefile.in +++ amarok-1.4.3/po/is/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/is/Makefile +#>- $(AUTOMAKE) --foreign po/is/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/is/Makefile + $(AUTOMAKE) --foreign po/is/Makefile cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/is/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/is/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/is/Makefile + $(AUTOMAKE) --foreign po/is/Makefile cd $(top_srcdir) && perl admin/am_edit po/is/Makefile.in --- amarok-1.4.3.orig/po/it/Makefile.in +++ amarok-1.4.3/po/it/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/it/Makefile +#>- $(AUTOMAKE) --foreign po/it/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/it/Makefile + $(AUTOMAKE) --foreign po/it/Makefile cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/it/Makefile + $(AUTOMAKE) --foreign po/it/Makefile cd $(top_srcdir) && perl admin/am_edit po/it/Makefile.in --- amarok-1.4.3.orig/po/ka/Makefile.in +++ amarok-1.4.3/po/ka/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ka/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ka/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ka/Makefile +#>- $(AUTOMAKE) --foreign po/ka/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ka/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ka/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ka/Makefile + $(AUTOMAKE) --foreign po/ka/Makefile cd $(top_srcdir) && perl admin/am_edit po/ka/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ka/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ka/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ka/Makefile + $(AUTOMAKE) --foreign po/ka/Makefile cd $(top_srcdir) && perl admin/am_edit po/ka/Makefile.in --- amarok-1.4.3.orig/po/km/Makefile.in +++ amarok-1.4.3/po/km/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/km/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/km/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/km/Makefile +#>- $(AUTOMAKE) --foreign po/km/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/km/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/km/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/km/Makefile + $(AUTOMAKE) --foreign po/km/Makefile cd $(top_srcdir) && perl admin/am_edit po/km/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/km/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/km/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/km/Makefile + $(AUTOMAKE) --foreign po/km/Makefile cd $(top_srcdir) && perl admin/am_edit po/km/Makefile.in --- amarok-1.4.3.orig/po/ko/Makefile.in +++ amarok-1.4.3/po/ko/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ko/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ko/Makefile +#>- $(AUTOMAKE) --foreign po/ko/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ko/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ko/Makefile + $(AUTOMAKE) --foreign po/ko/Makefile cd $(top_srcdir) && perl admin/am_edit po/ko/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ko/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ko/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ko/Makefile + $(AUTOMAKE) --foreign po/ko/Makefile cd $(top_srcdir) && perl admin/am_edit po/ko/Makefile.in --- amarok-1.4.3.orig/po/lt/Makefile.in +++ amarok-1.4.3/po/lt/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/lt/Makefile +#>- $(AUTOMAKE) --foreign po/lt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/lt/Makefile + $(AUTOMAKE) --foreign po/lt/Makefile cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/lt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/lt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/lt/Makefile + $(AUTOMAKE) --foreign po/lt/Makefile cd $(top_srcdir) && perl admin/am_edit po/lt/Makefile.in --- amarok-1.4.3.orig/po/nb/Makefile.in +++ amarok-1.4.3/po/nb/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/nb/Makefile +#>- $(AUTOMAKE) --foreign po/nb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nb/Makefile + $(AUTOMAKE) --foreign po/nb/Makefile cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nb/Makefile + $(AUTOMAKE) --foreign po/nb/Makefile cd $(top_srcdir) && perl admin/am_edit po/nb/Makefile.in --- amarok-1.4.3.orig/po/ms/Makefile.in +++ amarok-1.4.3/po/ms/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ms/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ms/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ms/Makefile +#>- $(AUTOMAKE) --foreign po/ms/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ms/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ms/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ms/Makefile + $(AUTOMAKE) --foreign po/ms/Makefile cd $(top_srcdir) && perl admin/am_edit po/ms/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ms/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ms/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ms/Makefile + $(AUTOMAKE) --foreign po/ms/Makefile cd $(top_srcdir) && perl admin/am_edit po/ms/Makefile.in --- amarok-1.4.3.orig/po/nl/Makefile.in +++ amarok-1.4.3/po/nl/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/nl/Makefile +#>- $(AUTOMAKE) --foreign po/nl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nl/Makefile + $(AUTOMAKE) --foreign po/nl/Makefile cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nl/Makefile + $(AUTOMAKE) --foreign po/nl/Makefile cd $(top_srcdir) && perl admin/am_edit po/nl/Makefile.in --- amarok-1.4.3.orig/po/nn/Makefile.in +++ amarok-1.4.3/po/nn/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/nn/Makefile +#>- $(AUTOMAKE) --foreign po/nn/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nn/Makefile + $(AUTOMAKE) --foreign po/nn/Makefile cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/nn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/nn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/nn/Makefile + $(AUTOMAKE) --foreign po/nn/Makefile cd $(top_srcdir) && perl admin/am_edit po/nn/Makefile.in --- amarok-1.4.3.orig/po/pa/Makefile.in +++ amarok-1.4.3/po/pa/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pa/Makefile +#>- $(AUTOMAKE) --foreign po/pa/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pa/Makefile + $(AUTOMAKE) --foreign po/pa/Makefile cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pa/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pa/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pa/Makefile + $(AUTOMAKE) --foreign po/pa/Makefile cd $(top_srcdir) && perl admin/am_edit po/pa/Makefile.in --- amarok-1.4.3.orig/po/pl/Makefile.in +++ amarok-1.4.3/po/pl/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pl/Makefile +#>- $(AUTOMAKE) --foreign po/pl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pl/Makefile + $(AUTOMAKE) --foreign po/pl/Makefile cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pl/Makefile + $(AUTOMAKE) --foreign po/pl/Makefile cd $(top_srcdir) && perl admin/am_edit po/pl/Makefile.in --- amarok-1.4.3.orig/po/pt/Makefile.in +++ amarok-1.4.3/po/pt/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pt/Makefile +#>- $(AUTOMAKE) --foreign po/pt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt/Makefile + $(AUTOMAKE) --foreign po/pt/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt/Makefile + $(AUTOMAKE) --foreign po/pt/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt/Makefile.in --- amarok-1.4.3.orig/po/ro/Makefile.in +++ amarok-1.4.3/po/ro/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ro/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ro/Makefile +#>- $(AUTOMAKE) --foreign po/ro/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ro/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ro/Makefile + $(AUTOMAKE) --foreign po/ro/Makefile cd $(top_srcdir) && perl admin/am_edit po/ro/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ro/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ro/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ro/Makefile + $(AUTOMAKE) --foreign po/ro/Makefile cd $(top_srcdir) && perl admin/am_edit po/ro/Makefile.in --- amarok-1.4.3.orig/po/ru/Makefile.in +++ amarok-1.4.3/po/ru/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ru/Makefile +#>- $(AUTOMAKE) --foreign po/ru/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ru/Makefile + $(AUTOMAKE) --foreign po/ru/Makefile cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ru/Makefile + $(AUTOMAKE) --foreign po/ru/Makefile cd $(top_srcdir) && perl admin/am_edit po/ru/Makefile.in --- amarok-1.4.3.orig/po/rw/Makefile.in +++ amarok-1.4.3/po/rw/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/rw/Makefile +#>- $(AUTOMAKE) --foreign po/rw/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/rw/Makefile + $(AUTOMAKE) --foreign po/rw/Makefile cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/rw/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/rw/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/rw/Makefile + $(AUTOMAKE) --foreign po/rw/Makefile cd $(top_srcdir) && perl admin/am_edit po/rw/Makefile.in --- amarok-1.4.3.orig/po/sl/Makefile.in +++ amarok-1.4.3/po/sl/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sl/Makefile +#>- $(AUTOMAKE) --foreign po/sl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sl/Makefile + $(AUTOMAKE) --foreign po/sl/Makefile cd $(top_srcdir) && perl admin/am_edit po/sl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sl/Makefile + $(AUTOMAKE) --foreign po/sl/Makefile cd $(top_srcdir) && perl admin/am_edit po/sl/Makefile.in --- amarok-1.4.3.orig/po/ta/Makefile.in +++ amarok-1.4.3/po/ta/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/ta/Makefile +#>- $(AUTOMAKE) --foreign po/ta/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ta/Makefile + $(AUTOMAKE) --foreign po/ta/Makefile cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/ta/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/ta/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/ta/Makefile + $(AUTOMAKE) --foreign po/ta/Makefile cd $(top_srcdir) && perl admin/am_edit po/ta/Makefile.in --- amarok-1.4.3.orig/po/sr/Makefile.in +++ amarok-1.4.3/po/sr/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sr/Makefile +#>- $(AUTOMAKE) --foreign po/sr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr/Makefile + $(AUTOMAKE) --foreign po/sr/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr/Makefile + $(AUTOMAKE) --foreign po/sr/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr/Makefile.in --- amarok-1.4.3.orig/po/tg/Makefile.in +++ amarok-1.4.3/po/tg/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tg/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tg/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/tg/Makefile +#>- $(AUTOMAKE) --foreign po/tg/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tg/Makefile + $(AUTOMAKE) --foreign po/tg/Makefile cd $(top_srcdir) && perl admin/am_edit po/tg/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tg/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tg/Makefile + $(AUTOMAKE) --foreign po/tg/Makefile cd $(top_srcdir) && perl admin/am_edit po/tg/Makefile.in --- amarok-1.4.3.orig/po/th/Makefile.in +++ amarok-1.4.3/po/th/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/th/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/th/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/th/Makefile +#>- $(AUTOMAKE) --foreign po/th/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/th/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/th/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/th/Makefile + $(AUTOMAKE) --foreign po/th/Makefile cd $(top_srcdir) && perl admin/am_edit po/th/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/th/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/th/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/th/Makefile + $(AUTOMAKE) --foreign po/th/Makefile cd $(top_srcdir) && perl admin/am_edit po/th/Makefile.in --- amarok-1.4.3.orig/po/sv/Makefile.in +++ amarok-1.4.3/po/sv/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sv/Makefile +#>- $(AUTOMAKE) --foreign po/sv/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sv/Makefile + $(AUTOMAKE) --foreign po/sv/Makefile cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sv/Makefile + $(AUTOMAKE) --foreign po/sv/Makefile cd $(top_srcdir) && perl admin/am_edit po/sv/Makefile.in --- amarok-1.4.3.orig/po/tr/Makefile.in +++ amarok-1.4.3/po/tr/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/tr/Makefile +#>- $(AUTOMAKE) --foreign po/tr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tr/Makefile + $(AUTOMAKE) --foreign po/tr/Makefile cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/tr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/tr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/tr/Makefile + $(AUTOMAKE) --foreign po/tr/Makefile cd $(top_srcdir) && perl admin/am_edit po/tr/Makefile.in --- amarok-1.4.3.orig/po/uk/Makefile.in +++ amarok-1.4.3/po/uk/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/uk/Makefile +#>- $(AUTOMAKE) --foreign po/uk/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uk/Makefile + $(AUTOMAKE) --foreign po/uk/Makefile cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uk/Makefile + $(AUTOMAKE) --foreign po/uk/Makefile cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in --- amarok-1.4.3.orig/po/uz/Makefile.in +++ amarok-1.4.3/po/uz/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uz/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/uz/Makefile +#>- $(AUTOMAKE) --foreign po/uz/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uz/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uz/Makefile + $(AUTOMAKE) --foreign po/uz/Makefile cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uz/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/uz/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/uz/Makefile + $(AUTOMAKE) --foreign po/uz/Makefile cd $(top_srcdir) && perl admin/am_edit po/uz/Makefile.in --- amarok-1.4.3.orig/po/en_GB/Makefile.in +++ amarok-1.4.3/po/en_GB/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/en_GB/Makefile +#>- $(AUTOMAKE) --foreign po/en_GB/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/en_GB/Makefile + $(AUTOMAKE) --foreign po/en_GB/Makefile cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/en_GB/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/en_GB/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/en_GB/Makefile + $(AUTOMAKE) --foreign po/en_GB/Makefile cd $(top_srcdir) && perl admin/am_edit po/en_GB/Makefile.in --- amarok-1.4.3.orig/po/pt_BR/Makefile.in +++ amarok-1.4.3/po/pt_BR/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/pt_BR/Makefile +#>- $(AUTOMAKE) --foreign po/pt_BR/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt_BR/Makefile + $(AUTOMAKE) --foreign po/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/pt_BR/Makefile + $(AUTOMAKE) --foreign po/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit po/pt_BR/Makefile.in --- amarok-1.4.3.orig/po/zh_CN/Makefile.in +++ amarok-1.4.3/po/zh_CN/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/zh_CN/Makefile +#>- $(AUTOMAKE) --foreign po/zh_CN/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_CN/Makefile + $(AUTOMAKE) --foreign po/zh_CN/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_CN/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_CN/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_CN/Makefile + $(AUTOMAKE) --foreign po/zh_CN/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_CN/Makefile.in --- amarok-1.4.3.orig/po/zh_TW/Makefile.in +++ amarok-1.4.3/po/zh_TW/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_TW/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/zh_TW/Makefile +#>- $(AUTOMAKE) --foreign po/zh_TW/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_TW/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_TW/Makefile + $(AUTOMAKE) --foreign po/zh_TW/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_TW/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/zh_TW/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/zh_TW/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/zh_TW/Makefile + $(AUTOMAKE) --foreign po/zh_TW/Makefile cd $(top_srcdir) && perl admin/am_edit po/zh_TW/Makefile.in --- amarok-1.4.3.orig/po/sr@Latn/Makefile.in +++ amarok-1.4.3/po/sr@Latn/Makefile.in @@ -117,6 +117,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -209,6 +210,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -257,6 +261,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -264,12 +269,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -292,8 +294,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -307,6 +312,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -339,18 +345,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,7 @@ all: all-nls 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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr@Latn/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr@Latn/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/sr@Latn/Makefile +#>- $(AUTOMAKE) --foreign po/sr@Latn/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr@Latn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr@Latn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr@Latn/Makefile + $(AUTOMAKE) --foreign po/sr@Latn/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr@Latn/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -799,9 +808,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/sr@Latn/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/sr@Latn/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/sr@Latn/Makefile + $(AUTOMAKE) --foreign po/sr@Latn/Makefile cd $(top_srcdir) && perl admin/am_edit po/sr@Latn/Makefile.in --- amarok-1.4.3.orig/po/Makefile.in +++ amarok-1.4.3/po/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -400,13 +409,13 @@ xmms_libs = @xmms_libs@ #>- SUBDIRS = $(AUTODIRS) #>+ 1 -SUBDIRS =. af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz zh_CN zh_TW +SUBDIRS =. af ar bg ca az br da de cs cy el es et fi ga fr gl he hi hu ja is it ka km ko lt nb ms nl nn pa pl pt ro ru rw sl ta sr tg th sv tr uk uz en_GB pt_BR zh_CN zh_TW sr@Latn #>- all: all-recursive #>+ 1 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*) \ @@ -415,9 +424,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu po/Makefile +#>- $(AUTOMAKE) --foreign po/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -427,9 +436,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/Makefile + $(AUTOMAKE) --foreign po/Makefile cd $(top_srcdir) && perl admin/am_edit po/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -444,9 +453,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -748,9 +757,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu po/Makefile + $(AUTOMAKE) --foreign po/Makefile cd $(top_srcdir) && perl admin/am_edit po/Makefile.in --- amarok-1.4.3.orig/doc/da/Makefile.in +++ amarok-1.4.3/doc/da/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/da/Makefile +#>- $(AUTOMAKE) --foreign doc/da/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/da/Makefile + $(AUTOMAKE) --foreign doc/da/Makefile cd $(top_srcdir) && perl admin/am_edit doc/da/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + @for base in config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for base in config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for file in config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/da/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/da/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/da/Makefile + $(AUTOMAKE) --foreign doc/da/Makefile cd $(top_srcdir) && perl admin/am_edit doc/da/Makefile.in --- amarok-1.4.3.orig/doc/de/Makefile.in +++ amarok-1.4.3/doc/de/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/de/Makefile +#>- $(AUTOMAKE) --foreign doc/de/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/de/Makefile + $(AUTOMAKE) --foreign doc/de/Makefile cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=add_dynamic.png hidden.docbook config_appearance.png media_device.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png playlist_window.png logo.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + @for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for file in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/de/Makefile + $(AUTOMAKE) --foreign doc/de/Makefile cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in --- amarok-1.4.3.orig/doc/es/Makefile.in +++ amarok-1.4.3/doc/es/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/es/Makefile +#>- $(AUTOMAKE) --foreign doc/es/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/es/Makefile + $(AUTOMAKE) --foreign doc/es/Makefile cd $(top_srcdir) && perl admin/am_edit doc/es/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,25 +586,25 @@ KDE_DIST=dynamic_mode2.png add_dynamic.png config_appearance.png media_device.png browser_choice.png file_browser.png pl_browser.png analyzer.png Makefile.in tab_music.png buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png config_collection.png script_manager.png musicbrainz.png collection.png quick.docbook config_playback.png equalizer.png vis_window.png tab_wiki.png playlist_browser.png play_list.png coverman.png config_general.png config_osd.png status_bar.png dynamic_mode1.png menubar.png tab_lyrics.png playlist_window.png logo.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 2 -docs-am: config_scrobbler.png play_list.png logo.png equalizer.png config_collection.png dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png config_osd.png coverman.png config_playback.png queue_manager.png pl_browser.png player_window.png file_browser.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +docs-am: vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_mode1.png dynamic_mode2.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png tab_lyrics.png tab_music.png config_appearance.png musicbrainz.png quick.docbook analyzer.png context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png play_list.png config_scrobbler.png config_general.png #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png logo.png equalizer.png config_collection.png dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png config_osd.png coverman.png config_playback.png queue_manager.png pl_browser.png player_window.png file_browser.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_mode1.png dynamic_mode2.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png tab_lyrics.png tab_music.png config_appearance.png musicbrainz.png quick.docbook analyzer.png context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png play_list.png config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png logo.png equalizer.png config_collection.png dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png config_osd.png coverman.png config_playback.png queue_manager.png pl_browser.png player_window.png file_browser.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_mode1.png dynamic_mode2.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png tab_lyrics.png tab_music.png config_appearance.png musicbrainz.png quick.docbook analyzer.png context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png play_list.png config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png logo.png equalizer.png config_collection.png dynamic_settings.png status_bar.png dynamic_bar.png dynamic_mode1.png dynamic_mode2.png config_osd.png coverman.png config_playback.png queue_manager.png pl_browser.png player_window.png file_browser.png config_appearance.png context.png analyzer.png playlist_window.png vis_window.png add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_mode1.png dynamic_mode2.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png tab_lyrics.png tab_music.png config_appearance.png musicbrainz.png quick.docbook analyzer.png context.png logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png play_list.png config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -609,9 +618,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/es/Makefile + $(AUTOMAKE) --foreign doc/es/Makefile cd $(top_srcdir) && perl admin/am_edit doc/es/Makefile.in --- amarok-1.4.3.orig/doc/et/Makefile.in +++ amarok-1.4.3/doc/et/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/et/Makefile +#>- $(AUTOMAKE) --foreign doc/et/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/et/Makefile + $(AUTOMAKE) --foreign doc/et/Makefile cd $(top_srcdir) && perl admin/am_edit doc/et/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=plugin.docbook hidden.docbook using.docbook Makefile.in advanced.docbook feature_guide.docbook quick.docbook index.docbook howto.docbook faq.docbook config.docbook requirements.docbook develop.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) requirements.docbook howto.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook hidden.docbook feature_guide.docbook quick.docbook develop.docbook plugin.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) develop.docbook feature_guide.docbook howto.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook hidden.docbook using.docbook plugin.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in requirements.docbook howto.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook hidden.docbook feature_guide.docbook quick.docbook develop.docbook plugin.docbook ; do \ + @for base in develop.docbook feature_guide.docbook howto.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook hidden.docbook using.docbook plugin.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in requirements.docbook howto.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook hidden.docbook feature_guide.docbook quick.docbook develop.docbook plugin.docbook ; do \ + for base in develop.docbook feature_guide.docbook howto.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook hidden.docbook using.docbook plugin.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in requirements.docbook howto.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook hidden.docbook feature_guide.docbook quick.docbook develop.docbook plugin.docbook ; do \ + for file in develop.docbook feature_guide.docbook howto.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook hidden.docbook using.docbook plugin.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/et/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/et/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/et/Makefile + $(AUTOMAKE) --foreign doc/et/Makefile cd $(top_srcdir) && perl admin/am_edit doc/et/Makefile.in --- amarok-1.4.3.orig/doc/fr/Makefile.in +++ amarok-1.4.3/doc/fr/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/fr/Makefile +#>- $(AUTOMAKE) --foreign doc/fr/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/fr/Makefile + $(AUTOMAKE) --foreign doc/fr/Makefile cd $(top_srcdir) && perl admin/am_edit doc/fr/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook feature_guide.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + @for base in feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for base in feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for file in feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/fr/Makefile + $(AUTOMAKE) --foreign doc/fr/Makefile cd $(top_srcdir) && perl admin/am_edit doc/fr/Makefile.in --- amarok-1.4.3.orig/doc/it/Makefile.in +++ amarok-1.4.3/doc/it/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/it/Makefile +#>- $(AUTOMAKE) --foreign doc/it/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/it/Makefile + $(AUTOMAKE) --foreign doc/it/Makefile cd $(top_srcdir) && perl admin/am_edit doc/it/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png completo.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in tab_music.png buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook tab_wiki.png playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png tab_lyrics.png playlist_window.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook completo.png playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook completo.png playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook completo.png playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png completo.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook completo.png playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/it/Makefile + $(AUTOMAKE) --foreign doc/it/Makefile cd $(top_srcdir) && perl admin/am_edit doc/it/Makefile.in --- amarok-1.4.3.orig/doc/nl/Makefile.in +++ amarok-1.4.3/doc/nl/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/nl/Makefile +#>- $(AUTOMAKE) --foreign doc/nl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/nl/Makefile + $(AUTOMAKE) --foreign doc/nl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/nl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in tab_music.png buttons.png dynamic_bar.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png tab_lyrics1.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook tab_wiki.png playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png tab_lyrics.png playlist_window.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook config_playback.png index.docbook status_bar.png feature_guide.docbook dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics1.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook config_playback.png index.docbook status_bar.png feature_guide.docbook dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics1.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook config_playback.png index.docbook status_bar.png feature_guide.docbook dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics1.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook config_playback.png index.docbook status_bar.png feature_guide.docbook dynamic_bar.png config_osd.png coverman.png queue_manager.png pl_browser.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png context.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook tab_lyrics1.png requirements.docbook menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics1.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png tab_wiki.png media_device.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/nl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/nl/Makefile + $(AUTOMAKE) --foreign doc/nl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/nl/Makefile.in --- amarok-1.4.3.orig/doc/pl/Makefile.in +++ amarok-1.4.3/doc/pl/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pl/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pl/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/pl/Makefile +#>- $(AUTOMAKE) --foreign doc/pl/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pl/Makefile + $(AUTOMAKE) --foreign doc/pl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pl/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + @for base in config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for base in config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for file in config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pl/Makefile + $(AUTOMAKE) --foreign doc/pl/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pl/Makefile.in --- amarok-1.4.3.orig/doc/pt/Makefile.in +++ amarok-1.4.3/doc/pt/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/pt/Makefile +#>- $(AUTOMAKE) --foreign doc/pt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt/Makefile + $(AUTOMAKE) --foreign doc/pt/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png file_browser.png analyzer.png using.docbook Makefile.in buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png playlist_window.png logo.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + @for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook status_bar.png dynamic_bar.png config_osd.png coverman.png config_playback.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook plugin.docbook add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png config_engine.png amarok_playlist.png collection.png ; do \ + for file in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png plugin.docbook config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt/Makefile + $(AUTOMAKE) --foreign doc/pt/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt/Makefile.in --- amarok-1.4.3.orig/doc/ru/Makefile.in +++ amarok-1.4.3/doc/ru/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/ru/Makefile +#>- $(AUTOMAKE) --foreign doc/ru/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/ru/Makefile + $(AUTOMAKE) --foreign doc/ru/Makefile cd $(top_srcdir) && perl admin/am_edit doc/ru/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=config_appearance.png file_browser.png pl_browser.png using.docbook Makefile.in config_scrobbler.png pl_tip1.png config_engine.png queue_manager.png advanced.docbook config_collection.png feature_guide.docbook collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook config.docbook requirements.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png dynamic_mode1.png menubar.png playlist_window.png context.png rmb_menu.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_scrobbler.png play_list.png equalizer.png config.docbook advanced.docbook feature_guide.docbook config_general.png faq.docbook index.docbook status_bar.png rmb_menu.png quick.docbook pl_tip1.png config_collection.png dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook playlist_window.png using.docbook file_browser.png context.png config_appearance.png menubar.png config_engine.png collection.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_playback.png dynamic_mode1.png feature_guide.docbook pl_tip1.png collection.png config.docbook playlist_window.png queue_manager.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png faq.docbook quick.docbook advanced.docbook context.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png equalizer.png config.docbook advanced.docbook feature_guide.docbook config_general.png faq.docbook index.docbook status_bar.png rmb_menu.png quick.docbook pl_tip1.png config_collection.png dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook playlist_window.png using.docbook file_browser.png context.png config_appearance.png menubar.png config_engine.png collection.png ; do \ + @for base in config_playback.png dynamic_mode1.png feature_guide.docbook pl_tip1.png collection.png config.docbook playlist_window.png queue_manager.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png faq.docbook quick.docbook advanced.docbook context.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png equalizer.png config.docbook advanced.docbook feature_guide.docbook config_general.png faq.docbook index.docbook status_bar.png rmb_menu.png quick.docbook pl_tip1.png config_collection.png dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook playlist_window.png using.docbook file_browser.png context.png config_appearance.png menubar.png config_engine.png collection.png ; do \ + for base in config_playback.png dynamic_mode1.png feature_guide.docbook pl_tip1.png collection.png config.docbook playlist_window.png queue_manager.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png faq.docbook quick.docbook advanced.docbook context.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png equalizer.png config.docbook advanced.docbook feature_guide.docbook config_general.png faq.docbook index.docbook status_bar.png rmb_menu.png quick.docbook pl_tip1.png config_collection.png dynamic_mode1.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png requirements.docbook playlist_window.png using.docbook file_browser.png context.png config_appearance.png menubar.png config_engine.png collection.png ; do \ + for file in config_playback.png dynamic_mode1.png feature_guide.docbook pl_tip1.png collection.png config.docbook playlist_window.png queue_manager.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png faq.docbook quick.docbook advanced.docbook context.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png pl_browser.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/ru/Makefile + $(AUTOMAKE) --foreign doc/ru/Makefile cd $(top_srcdir) && perl admin/am_edit doc/ru/Makefile.in --- amarok-1.4.3.orig/doc/sv/Makefile.in +++ amarok-1.4.3/doc/sv/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/sv/Makefile +#>- $(AUTOMAKE) --foreign doc/sv/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/sv/Makefile + $(AUTOMAKE) --foreign doc/sv/Makefile cd $(top_srcdir) && perl admin/am_edit doc/sv/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=plugin.docbook add_dynamic.png hidden.docbook config_appearance.png media_device.png browser_choice.png file_browser.png pl_browser.png analyzer.png using.docbook Makefile.in buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png config_colors.png feature_guide.docbook collection.png quick.docbook config_playback.png scripts_window.png index.docbook equalizer.png search.png faq.docbook vis_window.png config.docbook requirements.docbook streams.png playlist_browser.png develop.docbook play_list.png coverman.png config_general.png config_osd.png status_bar.png config_fonts.png welcome.png config_mysql.png menubar.png playlist_window.png context.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png config_fonts.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook streams.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png search.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png welcome.png add_dynamic.png config_colors.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png scripts_window.png file_browser.png using.docbook play_list.png plugin.docbook config_mysql.png config_scrobbler.png config_general.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png ; do \ + @for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png config_fonts.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook streams.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png search.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png welcome.png add_dynamic.png config_colors.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png scripts_window.png file_browser.png using.docbook play_list.png plugin.docbook config_mysql.png config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png ; do \ + for base in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png config_fonts.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook streams.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png search.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png welcome.png add_dynamic.png config_colors.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png scripts_window.png file_browser.png using.docbook play_list.png plugin.docbook config_mysql.png config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook feature_guide.docbook search.png status_bar.png dynamic_bar.png coverman.png config_osd.png config_playback.png pl_browser.png queue_manager.png config_collection.png using.docbook file_browser.png player_window.png context.png config_appearance.png analyzer.png hidden.docbook playlist_window.png vis_window.png develop.docbook config_mysql.png plugin.docbook add_dynamic.png browser_choice.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png pl_tip1.png quick.docbook config_fonts.png scripts_window.png streams.png requirements.docbook config_colors.png menubar.png config_engine.png amarok_playlist.png collection.png welcome.png ; do \ + for file in vis_window.png playlist_browser.png develop.docbook amarok_playlist.png config_playback.png feature_guide.docbook dynamic_bar.png config_fonts.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook streams.png playlist_window.png queue_manager.png buttons.png browser_choice.png menubar.png config_osd.png config_collection.png requirements.docbook config_appearance.png search.png faq.docbook quick.docbook analyzer.png advanced.docbook context.png script_manager.png welcome.png add_dynamic.png config_colors.png config_engine.png equalizer.png coverman.png index.docbook hidden.docbook status_bar.png media_device.png pl_browser.png rmb_menu.png scripts_window.png file_browser.png using.docbook play_list.png plugin.docbook config_mysql.png config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/sv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/sv/Makefile + $(AUTOMAKE) --foreign doc/sv/Makefile cd $(top_srcdir) && perl admin/am_edit doc/sv/Makefile.in --- amarok-1.4.3.orig/doc/pt_BR/Makefile.in +++ amarok-1.4.3/doc/pt_BR/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/pt_BR/Makefile +#>- $(AUTOMAKE) --foreign doc/pt_BR/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt_BR/Makefile + $(AUTOMAKE) --foreign doc/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt_BR/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=using.docbook Makefile.in advanced.docbook feature_guide.docbook quick.docbook index.docbook faq.docbook config.docbook requirements.docbook Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + @for base in feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for base in feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in feature_guide.docbook requirements.docbook advanced.docbook config.docbook using.docbook faq.docbook index.docbook quick.docbook ; do \ + for file in feature_guide.docbook config.docbook requirements.docbook faq.docbook quick.docbook advanced.docbook index.docbook using.docbook ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/pt_BR/Makefile + $(AUTOMAKE) --foreign doc/pt_BR/Makefile cd $(top_srcdir) && perl admin/am_edit doc/pt_BR/Makefile.in --- amarok-1.4.3.orig/doc/amarok/Makefile.in +++ amarok-1.4.3/doc/amarok/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/amarok/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/amarok/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/amarok/Makefile +#>- $(AUTOMAKE) --foreign doc/amarok/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/amarok/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/amarok/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/amarok/Makefile + $(AUTOMAKE) --foreign doc/amarok/Makefile cd $(top_srcdir) && perl admin/am_edit doc/amarok/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -577,7 +586,7 @@ KDE_DIST=add_dynamic.png config_appearance.png media_device.png file_browser.png analyzer.png using.docbook Makefile.in tab_music.png buttons.png dynamic_bar.png dynamic_settings.png config_scrobbler.png pl_tip1.png player_window.png config_engine.png queue_manager.png advanced.docbook config_collection.png script_manager.png musicbrainz.png collection.png quick.docbook config_playback.png index.docbook equalizer.png faq.docbook vis_window.png config.docbook requirements.docbook tab_wiki.png playlist_browser.png play_list.png coverman.png config_general.png config_osd.png status_bar.png menubar.png tab_lyrics.png playlist_window.png logo.png rmb_menu.png amarok_playlist.png Makefile.am #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_collection.png queue_manager.png player_window.png using.docbook file_browser.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png tab_wiki.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -604,20 +613,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok - @for base in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_collection.png queue_manager.png player_window.png using.docbook file_browser.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + @for base in vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png tab_wiki.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done uninstall-nls: - for base in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_collection.png queue_manager.png player_window.png using.docbook file_browser.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for base in vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png tab_wiki.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amarok/$$base ;\ done #>+ 5 distdir-nls: - for file in config_scrobbler.png play_list.png logo.png equalizer.png advanced.docbook config.docbook dynamic_settings.png index.docbook config_playback.png status_bar.png dynamic_bar.png config_osd.png coverman.png config_collection.png queue_manager.png player_window.png using.docbook file_browser.png config_appearance.png analyzer.png playlist_window.png vis_window.png add_dynamic.png media_device.png buttons.png script_manager.png config_general.png faq.docbook playlist_browser.png rmb_menu.png tab_music.png pl_tip1.png quick.docbook requirements.docbook musicbrainz.png menubar.png tab_wiki.png config_engine.png amarok_playlist.png collection.png tab_lyrics.png ; do \ + for file in vis_window.png playlist_browser.png amarok_playlist.png config_playback.png dynamic_bar.png pl_tip1.png collection.png player_window.png dynamic_settings.png config.docbook playlist_window.png queue_manager.png buttons.png menubar.png config_osd.png config_collection.png tab_lyrics.png requirements.docbook tab_music.png config_appearance.png musicbrainz.png faq.docbook quick.docbook analyzer.png advanced.docbook logo.png script_manager.png add_dynamic.png config_engine.png equalizer.png coverman.png index.docbook status_bar.png tab_wiki.png media_device.png rmb_menu.png file_browser.png using.docbook play_list.png config_scrobbler.png config_general.png ; do \ cp $(srcdir)/$$file $(distdir); \ done @@ -631,9 +640,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/amarok/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/amarok/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/amarok/Makefile + $(AUTOMAKE) --foreign doc/amarok/Makefile cd $(top_srcdir) && perl admin/am_edit doc/amarok/Makefile.in --- amarok-1.4.3.orig/doc/Makefile.in +++ amarok-1.4.3/doc/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -402,13 +411,13 @@ KDE_DOCS = AUTO #>- SUBDIRS = $(AUTODIRS) #>+ 1 -SUBDIRS =. amarok da de es et fr it nl pl pt pt_BR ru sv +SUBDIRS =. da de es et fr it nl pl pt ru sv pt_BR amarok #>- all: all-recursive #>+ 1 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*) \ @@ -417,9 +426,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/Makefile +#>- $(AUTOMAKE) --foreign doc/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -429,9 +438,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -446,9 +455,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -750,9 +759,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in --- amarok-1.4.3.orig/admin/ltmain.sh +++ amarok-1.4.3/admin/ltmain.sh @@ -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: --- amarok-1.4.3.orig/admin/install-sh +++ amarok-1.4.3/admin/install-sh @@ -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=" --- amarok-1.4.3.orig/admin/missing +++ amarok-1.4.3/admin/missing @@ -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 ;; --- amarok-1.4.3.orig/admin/libtool.m4.in +++ amarok-1.4.3/admin/libtool.m4.in @@ -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 --- amarok-1.4.3.orig/aclocal.m4 +++ amarok-1.4.3/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. --- amarok-1.4.3.orig/configure +++ amarok-1.4.3/configure @@ -1,8 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.60. # -# 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. ## --------------------- ## @@ -16,11 +17,35 @@ # 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 +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh + +# 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 + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -29,8 +54,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 +104,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 +124,386 @@ # 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 +for as_dir in /usr/bin/posix$PATH_SEPARATOR/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 +# Be Bourne compatible +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 +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +# Be Bourne compatible +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 +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +(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 +512,19 @@ as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # 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 +533,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 +571,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 +688,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= @@ -455,17 +745,372 @@ #endif #if HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif +#endif +#if HAVE_STDINT_H +# include #endif #if 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 LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND TAGLIB_CONFIG taglib_includes taglib_libs XINE_CONFIG with_xine_TRUE with_xine_FALSE CFLAGS_XINE LIBS_XINE with_nmm_TRUE with_nmm_FALSE CFLAGS_NMM LDFLAGS_NMM PKG_CONFIG ALSALIB_CFLAGS ALSALIB_LIBS with_helix_TRUE with_helix_FALSE gl_libs SQLITE_CFLAGS SQLITE_LIBS LIB_SQLITE with_included_sqlite_TRUE with_included_sqlite_FALSE MYSQL_CONFIG enable_mysql_TRUE enable_mysql_FALSE mysql_includes mysql_libs POSTGRESQL_CONFIG enable_postgresql_TRUE enable_postgresql_FALSE postgresql_includes postgresql_libs XMMS_CONFIG xmms_cflags xmms_libs GTK_CONFIG gtk_cflags gtk_libs with_xmmswrapper_TRUE with_xmmswrapper_FALSE SDL_CONFIG sdl_cflags sdl_libs LIBVISUAL_CFLAGS LIBVISUAL_LIBS with_libvisual_TRUE with_libvisual_FALSE LIB_TUNEPIMP with_konqsidebar_TRUE with_konqsidebar_FALSE LIBNJB_CFLAGS LIBNJB_LIBS with_libnjb_TRUE with_libnjb_FALSE LIBMTP_CFLAGS LIBMTP_LIBS LIBMTP_FRIENDLY_NAME with_libmtp_TRUE with_libmtp_FALSE IFP_INCLUDES IFP_LIBS with_ifp_TRUE with_ifp_FALSE LIBGPOD_CFLAGS LIBGPOD_LIBS with_libgpod_TRUE with_libgpod_FALSE MP4V2_INCLUDES MP4V2_LIBS with_mp4v2_TRUE with_mp4v2_FALSE DNSSD_LIBS atleast_kde34_TRUE atleast_kde34_FALSE RUBY ruby_includes ruby_ldflags TOPSUBDIRS amarok_SUBDIR_included_TRUE amarok_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_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 +LIB_ARTS +QTDOCDIR +KDE_HAVE_DOT +DOXYGEN +DOXYGEN_PROJECT_NAME +DOXYGEN_PROJECT_NUMBER +KDE_HAS_DOXYGEN +PKGCONFIGFOUND +TAGLIB_CONFIG +taglib_includes +taglib_libs +XINE_CONFIG +with_xine_TRUE +with_xine_FALSE +CFLAGS_XINE +LIBS_XINE +with_nmm_TRUE +with_nmm_FALSE +CFLAGS_NMM +LDFLAGS_NMM +PKG_CONFIG +ALSALIB_CFLAGS +ALSALIB_LIBS +with_helix_TRUE +with_helix_FALSE +gl_libs +SQLITE_CFLAGS +SQLITE_LIBS +LIB_SQLITE +with_included_sqlite_TRUE +with_included_sqlite_FALSE +MYSQL_CONFIG +enable_mysql_TRUE +enable_mysql_FALSE +mysql_includes +mysql_libs +POSTGRESQL_CONFIG +enable_postgresql_TRUE +enable_postgresql_FALSE +postgresql_includes +postgresql_libs +XMMS_CONFIG +xmms_cflags +xmms_libs +GTK_CONFIG +gtk_cflags +gtk_libs +with_xmmswrapper_TRUE +with_xmmswrapper_FALSE +SDL_CONFIG +sdl_cflags +sdl_libs +LIBVISUAL_CFLAGS +LIBVISUAL_LIBS +with_libvisual_TRUE +with_libvisual_FALSE +LIB_TUNEPIMP +with_konqsidebar_TRUE +with_konqsidebar_FALSE +LIBNJB_CFLAGS +LIBNJB_LIBS +with_libnjb_TRUE +with_libnjb_FALSE +LIBMTP_CFLAGS +LIBMTP_LIBS +LIBMTP_FRIENDLY_NAME +with_libmtp_TRUE +with_libmtp_FALSE +IFP_INCLUDES +IFP_LIBS +with_ifp_TRUE +with_ifp_FALSE +LIBGPOD_CFLAGS +LIBGPOD_LIBS +with_libgpod_TRUE +with_libgpod_FALSE +MP4V2_INCLUDES +MP4V2_LIBS +with_mp4v2_TRUE +with_mp4v2_FALSE +DNSSD_LIBS +atleast_kde34_TRUE +atleast_kde34_FALSE +RUBY +ruby_includes +ruby_ldflags +TOPSUBDIRS +amarok_SUBDIR_included_TRUE +amarok_SUBDIR_included_FALSE +doc_SUBDIR_included_TRUE +doc_SUBDIR_included_FALSE +po_SUBDIR_included_TRUE +po_SUBDIR_included_FALSE +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS +XMKMF +PKGCONFIGFOUND' + # Initialize some variables set by options. ac_init_help= @@ -492,34 +1137,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,12 +1200,18 @@ --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. @@ -554,7 +1219,17 @@ { 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" ;; + 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-\([^=]*\)'` @@ -563,11 +1238,7 @@ { 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'" ;; + 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 +1265,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 +1295,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 +1369,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 ;; @@ -745,11 +1435,7 @@ { 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'" ;; + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` @@ -758,7 +1444,7 @@ { 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" ;; + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -789,8 +1475,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 +1495,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,22 +1534,43 @@ 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 srcdir=.. @@ -881,74 +1579,31 @@ 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 + 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 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 -ac_env_PKGCONFIGFOUND_set=${PKGCONFIGFOUND+set} -ac_env_PKGCONFIGFOUND_value=$PKGCONFIGFOUND -ac_cv_env_PKGCONFIGFOUND_set=${PKGCONFIGFOUND+set} -ac_cv_env_PKGCONFIGFOUND_value=$PKGCONFIGFOUND +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. @@ -977,9 +1632,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] @@ -997,15 +1649,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 @@ -1029,6 +1688,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 @@ -1046,10 +1707,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] @@ -1073,8 +1732,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 @@ -1105,14 +1763,15 @@ 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 + 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 PKGCONFIGFOUND Path to pkg-config @@ -1120,118 +1779,86 @@ 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.60 -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.60. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1250,7 +1877,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` @@ -1264,6 +1891,7 @@ test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1285,7 +1913,6 @@ ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1296,7 +1923,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 @@ -1318,9 +1945,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 @@ -1331,8 +1956,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. { @@ -1345,20 +1970,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 @@ -1369,22 +2008,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 @@ -1396,26 +2041,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. @@ -1446,14 +2089,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;} @@ -1469,8 +2115,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 @@ -1482,12 +2128,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 @@ -1512,8 +2157,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 @@ -1530,12 +2174,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 - @@ -1552,110 +2190,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. @@ -1665,17 +2358,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" @@ -1697,8 +2390,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 @@ -1720,7 +2413,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_executable_p "$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. @@ -1739,21 +2432,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. @@ -1767,8 +2461,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 @@ -1780,8 +2474,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 @@ -1791,8 +2485,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 @@ -1834,8 +2528,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` @@ -1886,8 +2580,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 @@ -1900,54 +2594,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_executable_p "$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 @@ -1979,7 +2676,7 @@ # Define the identity of the package. - PACKAGE=multimedia + PACKAGE=amarok-1.4.3 VERSION="3.5.4" @@ -2018,8 +2715,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 @@ -2032,32 +2729,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_executable_p "$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 @@ -2070,27 +2769,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_executable_p "$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 @@ -2110,6 +2823,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 @@ -2128,14 +2866,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 @@ -2178,8 +2916,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. @@ -2190,8 +2928,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 @@ -2200,14 +2938,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 @@ -2250,8 +2988,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. @@ -2262,8 +3000,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 @@ -2285,16 +3023,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 @@ -2307,13 +3045,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= @@ -2330,11 +3068,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} @@ -2344,8 +3082,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 @@ -2372,15 +3110,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='\' @@ -2400,10 +3138,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" @@ -2423,18 +3160,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 @@ -2443,12 +3180,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 @@ -2457,20 +3194,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" @@ -2482,8 +3220,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 @@ -2496,32 +3234,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_executable_p "$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 @@ -2534,36 +3274,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_executable_p "$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 @@ -2576,74 +3331,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_executable_p "$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 @@ -2657,7 +3372,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_executable_p "$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 @@ -2668,6 +3383,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. @@ -2685,22 +3401,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 @@ -2713,36 +3430,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_executable_p "$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 @@ -2755,29 +3474,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_executable_p "$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 @@ -2790,21 +3525,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); } @@ -2829,46 +3578,70 @@ # 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 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2881,19 +3654,23 @@ fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 +{ 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 @@ -2912,22 +3689,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 @@ -2938,9 +3720,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 @@ -2954,14 +3735,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 @@ -2981,14 +3762,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 @@ -3006,12 +3793,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 @@ -3034,24 +3821,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -3060,24 +3859,28 @@ 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 @@ -3093,24 +3896,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -3119,285 +3934,278 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -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 - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - 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 $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* 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 - 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. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; int main () { -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; 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__" -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 +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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 - ac_cv_prog_cc_stdc=$ac_arg -break + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC + 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. */ -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 ;; - *) - 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" ;; -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 +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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 - : + ac_cv_prog_cc_g=yes 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 + +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_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; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ 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_c89=no +ac_save_CC=$CC +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 +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* 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 -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 -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);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; int main () { -exit (42); +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +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 { (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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 - break + 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 conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break 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 conftest.$ac_ext +CC=$ac_save_CC + fi +# 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; } ;; + *) + 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 -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' @@ -3406,8 +4214,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 @@ -3496,8 +4304,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 @@ -3519,8 +4327,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= @@ -3554,8 +4362,13 @@ #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 @@ -3580,9 +4393,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. */ @@ -3592,8 +4406,13 @@ /* 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 @@ -3620,6 +4439,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3637,8 +4457,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 @@ -3661,8 +4481,13 @@ #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 @@ -3687,9 +4512,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. */ @@ -3699,8 +4525,13 @@ /* 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 @@ -3727,6 +4558,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3777,18 +4609,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 @@ -3801,36 +4637,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_executable_p "$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 @@ -3843,55 +4681,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_executable_p "$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 @@ -3914,24 +4782,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -3940,24 +4820,28 @@ 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 @@ -3973,24 +4857,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -3999,70 +4895,53 @@ 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -4071,61 +4950,91 @@ 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 - break + 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' @@ -4134,8 +5043,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 @@ -4224,8 +5133,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 @@ -4243,8 +5152,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 @@ -4269,24 +5178,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -4295,13 +5216,14 @@ 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: @@ -4343,17 +5265,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' @@ -4381,24 +5302,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -4407,8 +5340,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4421,29 +5356,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' @@ -4470,24 +5404,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -4496,8 +5442,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4510,13 +5458,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 @@ -4537,16 +5485,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' @@ -4573,24 +5520,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -4599,8 +5558,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4613,16 +5574,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 @@ -4637,16 +5598,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' @@ -4673,24 +5633,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -4699,8 +5671,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4713,27 +5687,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' @@ -4758,24 +5731,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -4784,8 +5769,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$ac_exeext conftest.$ac_ext CFLAGS="$save_CFLAGS" ac_ext=c @@ -4798,13 +5785,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 @@ -4812,16 +5799,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' @@ -4848,24 +5834,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -4874,8 +5872,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4888,28 +5888,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' @@ -4936,24 +5935,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -4962,8 +5973,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4976,28 +5989,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' @@ -5024,24 +6036,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5050,8 +6074,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5064,13 +6090,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 @@ -5082,13 +6108,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 @@ -5096,16 +6122,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' @@ -5132,24 +6157,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5158,8 +6195,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5172,13 +6211,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 @@ -5190,16 +6229,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' @@ -5226,24 +6264,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5252,8 +6302,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5266,28 +6318,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' @@ -5314,24 +6365,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5340,8 +6403,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5354,28 +6419,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' @@ -5402,24 +6466,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5428,8 +6504,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5442,28 +6520,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' @@ -5490,24 +6567,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5516,8 +6605,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5530,13 +6621,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 @@ -5544,37 +6635,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 @@ -5606,24 +6697,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5632,18 +6735,19 @@ 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$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//"`" @@ -5663,16 +6767,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' @@ -5699,24 +6802,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5725,8 +6840,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5739,29 +6856,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' @@ -5788,24 +6904,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5814,8 +6942,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5828,28 +6958,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' @@ -5876,24 +7005,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5902,8 +7043,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5916,28 +7059,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' @@ -5964,24 +7106,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -5990,8 +7144,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6004,28 +7160,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' @@ -6052,24 +7207,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -6078,8 +7245,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6092,28 +7261,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' @@ -6140,24 +7308,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -6166,8 +7346,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6180,13 +7362,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 @@ -6293,13 +7475,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 @@ -6329,8 +7511,13 @@ #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 @@ -6355,9 +7542,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. */ @@ -6367,8 +7555,13 @@ /* 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 @@ -6395,6 +7588,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6412,8 +7606,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 @@ -6436,8 +7630,13 @@ #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 @@ -6462,9 +7661,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. */ @@ -6474,8 +7674,13 @@ /* 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 @@ -6502,6 +7707,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6528,16 +7734,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' @@ -6564,24 +7769,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -6590,8 +7807,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6604,22 +7823,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" @@ -6635,36 +7853,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' @@ -6691,24 +7909,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -6717,8 +7947,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6731,29 +7963,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' @@ -6780,24 +8011,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -6806,8 +8049,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6820,13 +8065,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 @@ -6836,13 +8081,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="" @@ -6855,13 +8100,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 @@ -6872,270 +8117,91 @@ KDE_USE_CLOSURE_TRUE="#" KDE_USE_CLOSURE_FALSE="" KDE_NO_UNDEFINED="" - case $host in - *-*-linux-gnu) + fi -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' + # Check whether --enable-nmcheck was given. +if test "${enable_nmcheck+set}" = set; then + enableval=$enable_nmcheck; kde_use_nmcheck=$enableval +else + kde_use_nmcheck=no +fi - 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. */ + if test "$kde_use_nmcheck" = "yes"; then + KDE_USE_NMCHECK_TRUE="" + KDE_USE_NMCHECK_FALSE="#" + else + KDE_USE_NMCHECK_TRUE="#" + KDE_USE_NMCHECK_FALSE="" + fi -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 +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else + enable_shared=yes +fi +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no +fi - 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. -if test "${enable_nmcheck+set}" = set; then - enableval="$enable_nmcheck" - kde_use_nmcheck=$enableval -else - kde_use_nmcheck=no -fi; - - if test "$kde_use_nmcheck" = "yes"; then - KDE_USE_NMCHECK_TRUE="" - KDE_USE_NMCHECK_FALSE="#" - else - KDE_USE_NMCHECK_TRUE="#" - KDE_USE_NMCHECK_FALSE="" - fi - - - - - - -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi; - -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no -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 @@ -7156,8 +8222,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 "" @@ -7173,14 +8239,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 ;; @@ -7199,10 +8264,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 @@ -7226,7 +8292,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 @@ -7255,37 +8321,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_executable_p "$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 + + +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_prog_egrep+set}" = set; then +{ 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_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + 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 + 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_executable_p "$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 @@ -7314,11 +8527,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 @@ -7331,7 +8544,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 @@ -7405,56 +8627,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 @@ -7481,44 +8710,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.*` ;; @@ -7534,7 +8755,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 @@ -7550,43 +8771,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 @@ -7605,32 +8810,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]' @@ -7651,17 +8846,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 @@ -7670,14 +8868,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 @@ -7704,7 +8905,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7707 "configure"' > conftest.$ac_ext + echo '#line 8908 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7747,14 +8948,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*) @@ -7766,7 +8966,6 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" @@ -7791,8 +8990,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 @@ -7818,24 +9017,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -7844,9 +9055,10 @@ 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$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7855,13 +9067,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 @@ -7869,8 +9101,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 @@ -7894,24 +9126,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -7920,9 +9164,10 @@ 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. @@ -7978,6 +9223,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)) @@ -7997,18 +9243,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 @@ -8021,12 +9276,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 @@ -8049,9 +9306,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 @@ -8065,24 +9322,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -8091,12 +9360,14 @@ 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 @@ -8111,18 +9382,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 @@ -8133,24 +9405,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -8159,15 +9443,16 @@ 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 @@ -8176,8 +9461,13 @@ /* 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 @@ -8201,9 +9491,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 @@ -8227,25 +9518,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 @@ -8257,236 +9542,555 @@ 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:8352:" \ - "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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes + (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 + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + # Broken: fails on valid input. +continue fi -rm -f 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 -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 -if test "${ac_cv_prog_f77_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF - program main +rm -f conftest.err conftest.$ac_ext - end + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +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); } && - { 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 - ac_cv_prog_f77_g=yes + (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 + # Broken: success on invalid input. +continue else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f 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 -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi -else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi -fi +rm -f conftest.err conftest.$ac_ext -G77=`test $ac_compiler_gnu = yes && echo yes` +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; 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 + : +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; 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 + # 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 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 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_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 +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 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 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_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 +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); } && + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_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 + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +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; } +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; } +if test "${ac_cv_prog_f77_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + FFLAGS=-g +cat >conftest.$ac_ext <<_ACEOF + program main + + 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); } && + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_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 + 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 +fi + +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; } +if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS +elif test $ac_cv_prog_f77_g = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then + FFLAGS="-g -O2" + else + FFLAGS="-g" + fi +else + if test "x$ac_cv_f77_compiler_gnu" = xyes; then + FFLAGS="-O2" + else + FFLAGS= + fi +fi + +G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8498,13 +10102,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*) @@ -8533,20 +10137,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. @@ -8557,19 +10211,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 @@ -8583,9 +10237,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'" @@ -8607,14 +10258,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]' @@ -8632,14 +10299,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 @@ -8757,15 +10427,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 @@ -8779,8 +10449,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 @@ -8801,7 +10471,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. @@ -8821,7 +10491,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" @@ -8831,8 +10501,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 @@ -8845,32 +10515,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_executable_p "$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 @@ -8883,27 +10555,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_executable_p "$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 @@ -8911,8 +10597,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 @@ -8925,32 +10611,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_executable_p "$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 @@ -8963,27 +10651,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_executable_p "$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 @@ -8991,8 +10693,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 @@ -9005,32 +10707,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_executable_p "$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 @@ -9043,27 +10747,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_executable_p "$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 @@ -9078,6 +10796,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" @@ -9097,21 +10816,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 @@ -9131,7 +10861,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 @@ -9163,17 +10893,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 @@ -9193,7 +10923,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 @@ -9225,11 +10955,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 @@ -9244,21 +10974,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 @@ -9288,68 +11018,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: @@ -9363,8 +11050,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 @@ -9378,26 +11065,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:9384: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11071: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9388: \$? = $ac_status" >&5 + echo "$as_me:11075: \$? = $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" @@ -9411,8 +11100,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,' @@ -9450,6 +11139,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. @@ -9466,7 +11160,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 ;; @@ -9492,6 +11186,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 @@ -9503,7 +11207,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 ;; @@ -9526,13 +11230,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. @@ -9547,15 +11258,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*) @@ -9564,7 +11275,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' @@ -9577,6 +11288,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' @@ -9588,16 +11310,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 @@ -9611,26 +11333,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:9617: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11339: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9621: \$? = $ac_status" >&5 + echo "$as_me:11343: \$? = $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 @@ -9643,7 +11367,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= @@ -9653,8 +11377,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 @@ -9665,60 +11431,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:9684: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11443: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9688: \$? = $ac_status" >&5 + echo "$as_me:11447: \$? = $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;} @@ -9728,8 +11492,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= @@ -9767,6 +11531,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*) @@ -9777,6 +11551,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 ;; @@ -9787,6 +11565,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*) @@ -9824,7 +11623,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 @@ -9834,13 +11633,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 @@ -9849,23 +11648,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 @@ -9879,13 +11725,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= @@ -9895,24 +11768,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) @@ -9924,7 +11792,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 @@ -9946,9 +11814,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 @@ -9965,7 +11845,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` @@ -9984,8 +11864,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 @@ -9993,22 +11877,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 @@ -10024,24 +11909,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -10055,19 +11952,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$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 @@ -10086,24 +11984,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -10117,8 +12027,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$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10127,13 +12039,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 ;; @@ -10146,7 +12056,7 @@ ld_shlibs=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec=-rdynamic ;; @@ -10156,13 +12066,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. @@ -10172,52 +12082,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 ;; @@ -10251,8 +12161,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 @@ -10260,7 +12170,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 @@ -10274,47 +12184,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' @@ -10328,7 +12253,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' @@ -10338,7 +12263,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 @@ -10361,7 +12286,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 @@ -10371,7 +12297,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 @@ -10382,14 +12308,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' @@ -10401,13 +12327,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' @@ -10415,21 +12341,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' @@ -10438,8 +12358,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 ;; @@ -10448,7 +12378,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 @@ -10496,36 +12426,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*) @@ -10540,15 +12479,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? # @@ -10566,8 +12500,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 @@ -10581,6 +12515,7 @@ libobjs=conftest.$ac_objext deplibs= wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic compiler_flags=-v linker_flags=-v verstring= @@ -10603,20 +12538,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= @@ -10626,7 +12561,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 @@ -10691,7 +12639,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*) @@ -10700,7 +12648,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}' @@ -10716,7 +12664,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -10728,7 +12676,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' @@ -10758,7 +12707,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 ;; @@ -10781,7 +12730,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"` @@ -10804,20 +12753,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*) @@ -10835,14 +12781,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 ;; @@ -10862,9 +12813,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 @@ -10879,7 +12830,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 @@ -10890,7 +12841,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 @@ -10902,6 +12853,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 ;; @@ -10945,29 +12908,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, @@ -10977,6 +12937,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 @@ -10986,7 +12958,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 @@ -11014,8 +12986,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 @@ -11035,7 +13012,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' @@ -11053,13 +13030,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 @@ -11085,7 +13055,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' @@ -11118,6 +13088,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}' @@ -11129,16 +13122,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 && @@ -11158,8 +13156,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 @@ -11172,29 +13170,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 @@ -11226,8 +13224,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 @@ -11240,40 +13238,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -11282,14 +13292,15 @@ 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$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 @@ -11303,8 +13314,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 @@ -11331,53 +13342,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -11386,18 +13403,19 @@ 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$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 @@ -11410,40 +13428,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -11452,19 +13482,20 @@ 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$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 @@ -11491,53 +13522,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -11546,18 +13583,19 @@ 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$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 @@ -11570,40 +13608,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -11612,19 +13662,20 @@ 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$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 @@ -11637,40 +13688,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -11679,19 +13742,20 @@ 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$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 @@ -11704,40 +13768,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -11746,14 +13822,15 @@ 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$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 @@ -11788,13 +13865,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 @@ -11804,7 +13881,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 @@ -11886,13 +13965,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 @@ -11902,7 +13981,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 @@ -11984,8 +14065,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" @@ -12006,19 +14087,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 @@ -12027,58 +14108,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 @@ -12093,7 +14137,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 \ @@ -12207,11 +14252,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= @@ -12241,6 +14286,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 @@ -12252,6 +14303,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler @@ -12271,7 +14325,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 @@ -12302,7 +14356,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -12317,7 +14371,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? @@ -12544,7 +14598,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 @@ -12557,11 +14614,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 @@ -12579,6 +14636,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. @@ -12609,8 +14669,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' @@ -12629,6 +14691,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= @@ -12646,7 +14709,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 @@ -12656,17 +14719,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 @@ -12677,18 +14757,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 @@ -12702,18 +14791,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 @@ -12742,11 +14831,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 @@ -12759,7 +14848,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 @@ -12812,8 +14901,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' @@ -12839,7 +14928,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 @@ -12854,8 +14943,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*) @@ -12870,8 +14959,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 @@ -12888,7 +14992,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` @@ -12907,8 +15011,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 @@ -12917,15 +15025,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. @@ -12947,24 +15056,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -12978,20 +15099,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$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 @@ -13010,24 +15132,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -13041,8 +15175,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$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -13051,16 +15187,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 *) @@ -13074,12 +15220,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 @@ -13088,70 +15234,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 @@ -13162,14 +15319,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 @@ -13186,12 +15343,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. @@ -13200,11 +15357,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 @@ -13214,33 +15371,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 @@ -13251,17 +15397,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 @@ -13277,12 +15426,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 @@ -13293,11 +15445,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 @@ -13308,9 +15474,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 @@ -13319,16 +15485,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. @@ -13346,20 +15512,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' @@ -13387,7 +15577,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -13397,7 +15587,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= @@ -13408,15 +15598,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=: @@ -13426,14 +15632,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=: @@ -13451,7 +15657,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=: @@ -13470,13 +15676,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=: @@ -13485,17 +15691,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' @@ -13514,7 +15720,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=: @@ -13535,27 +15741,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 @@ -13568,36 +15761,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 @@ -13605,9 +15795,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' @@ -13617,9 +15807,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 @@ -13628,9 +15818,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 @@ -13643,12 +15833,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 @@ -13668,8 +15909,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" @@ -13705,7 +15946,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 @@ -13745,7 +15986,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 @@ -13781,6 +16022,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 @@ -13789,8 +16053,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 @@ -13828,6 +16092,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 @@ -13836,7 +16104,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*) ;; *) @@ -13861,18 +16129,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' ;; @@ -13880,22 +16158,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 ;; @@ -13908,9 +16186,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. @@ -13919,20 +16201,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. @@ -13949,25 +16237,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 @@ -13981,24 +16269,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' ;; @@ -14008,12 +16287,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' ;; @@ -14023,7 +16302,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 lt_prog_compiler_pic_CXX='-KPIC' ;; @@ -14031,7 +16310,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*) ;; @@ -14041,16 +16327,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 @@ -14064,26 +16350,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:14070: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16356: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14074: \$? = $ac_status" >&5 + echo "$as_me:16360: \$? = $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 @@ -14096,7 +16384,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= @@ -14106,8 +16394,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 @@ -14118,60 +16448,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:14137: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16460: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14141: \$? = $ac_status" >&5 + echo "$as_me:16464: \$? = $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;} @@ -14181,8 +16509,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 @@ -14199,22 +16527,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? # @@ -14232,8 +16558,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 @@ -14247,6 +16573,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= @@ -14269,20 +16596,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= @@ -14292,7 +16619,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 @@ -14357,7 +16697,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*) @@ -14366,7 +16706,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}' @@ -14382,7 +16722,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -14394,7 +16734,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' @@ -14424,7 +16765,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 ;; @@ -14447,7 +16788,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"` @@ -14470,20 +16811,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*) @@ -14501,14 +16839,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 ;; @@ -14528,9 +16871,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 @@ -14545,7 +16888,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 @@ -14556,7 +16899,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 @@ -14568,6 +16911,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 ;; @@ -14611,29 +16966,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, @@ -14643,6 +16995,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 @@ -14652,7 +17016,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 @@ -14680,8 +17044,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 @@ -14701,7 +17070,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' @@ -14719,13 +17088,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 @@ -14751,7 +17113,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' @@ -14784,6 +17146,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}' @@ -14795,16 +17180,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 && @@ -14824,8 +17214,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 @@ -14836,1001 +17226,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 @@ -15846,7 +17411,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -15861,7 +17426,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? @@ -16063,7 +17628,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 @@ -16135,29 +17703,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 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 @@ -16165,21 +17759,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" @@ -16188,8 +17782,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,' @@ -16227,6 +17821,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. @@ -16243,7 +17842,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 ;; @@ -16269,6 +17868,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 @@ -16280,7 +17889,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 ;; @@ -16303,13 +17912,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. @@ -16324,15 +17940,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*) @@ -16341,7 +17957,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' @@ -16354,6 +17970,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' @@ -16365,16 +17992,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 @@ -16388,26 +18015,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:16394: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18021: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16398: \$? = $ac_status" >&5 + echo "$as_me:18025: \$? = $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 @@ -16420,7 +18049,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= @@ -16430,72 +18059,112 @@ ;; 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 -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then +# +# 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_cv_prog_compiler_c_o_F77=no - $rm -r conftest 2>/dev/null - mkdir conftest + 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 + lt_cv_prog_compiler_c_o_F77=no + $rm -r conftest 2>/dev/null + mkdir conftest cd conftest 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:16461: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18125: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16465: \$? = $ac_status" >&5 + echo "$as_me:18129: \$? = $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;} @@ -16505,8 +18174,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= @@ -16544,6 +18213,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*) @@ -16554,6 +18233,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 ;; @@ -16564,6 +18247,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*) @@ -16601,7 +18305,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 @@ -16611,13 +18315,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 @@ -16626,23 +18330,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 @@ -16656,13 +18407,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= @@ -16672,24 +18450,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) @@ -16701,7 +18474,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 @@ -16723,9 +18496,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 @@ -16742,7 +18527,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` @@ -16761,8 +18546,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 @@ -16770,45 +18559,58 @@ # 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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -16822,19 +18624,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$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 @@ -16843,24 +18646,36 @@ 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_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -16874,8 +18689,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$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16884,13 +18701,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 ;; @@ -16903,7 +18718,7 @@ ld_shlibs_F77=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_F77=-rdynamic ;; @@ -16913,68 +18728,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 ;; @@ -17008,8 +18823,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 @@ -17017,7 +18832,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 @@ -17031,47 +18846,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' @@ -17085,7 +18915,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' @@ -17095,7 +18925,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 @@ -17118,7 +18948,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 @@ -17128,7 +18959,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 @@ -17139,14 +18970,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' @@ -17158,13 +18989,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' @@ -17172,21 +19003,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' @@ -17195,8 +19020,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 ;; @@ -17205,7 +19040,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 @@ -17253,36 +19088,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*) @@ -17297,15 +19141,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? # @@ -17323,8 +19162,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 @@ -17338,6 +19177,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= @@ -17360,20 +19200,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= @@ -17383,7 +19223,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 @@ -17448,7 +19301,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*) @@ -17457,7 +19310,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}' @@ -17473,7 +19326,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -17485,7 +19338,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' @@ -17515,7 +19369,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 ;; @@ -17538,7 +19392,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"` @@ -17561,20 +19415,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*) @@ -17592,14 +19443,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 ;; @@ -17619,9 +19475,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 @@ -17636,7 +19492,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 @@ -17647,7 +19503,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 @@ -17659,6 +19515,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 ;; @@ -17702,29 +19570,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, @@ -17734,6 +19599,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 @@ -17743,7 +19620,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 @@ -17771,8 +19648,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 @@ -17792,7 +19674,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' @@ -17810,13 +19692,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 @@ -17842,7 +19717,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' @@ -17875,6 +19750,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}' @@ -17886,16 +19784,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 && @@ -17915,8 +19818,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 @@ -17927,36 +19830,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 @@ -17971,7 +19844,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 \ @@ -18071,6 +19945,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 @@ -18082,6 +19962,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_F77 @@ -18101,7 +19984,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 @@ -18132,7 +20015,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -18147,7 +20030,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? @@ -18349,7 +20232,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 @@ -18370,7 +20256,6 @@ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -18382,26 +20267,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 @@ -18413,8 +20327,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 @@ -18428,26 +20342,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:18434: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20348: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18438: \$? = $ac_status" >&5 + echo "$as_me:20352: \$? = $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" @@ -18461,8 +20377,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,' @@ -18500,6 +20416,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. @@ -18516,7 +20437,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 ;; @@ -18542,6 +20463,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 @@ -18553,7 +20484,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 ;; @@ -18576,13 +20507,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. @@ -18597,15 +20535,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*) @@ -18614,7 +20552,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' @@ -18627,6 +20565,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' @@ -18638,16 +20587,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 @@ -18661,26 +20610,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:18667: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20616: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18671: \$? = $ac_status" >&5 + echo "$as_me:20620: \$? = $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 @@ -18693,7 +20644,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= @@ -18703,8 +20654,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 @@ -18715,60 +20708,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:18734: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20720: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18738: \$? = $ac_status" >&5 + echo "$as_me:20724: \$? = $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;} @@ -18778,8 +20769,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= @@ -18817,6 +20808,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*) @@ -18827,6 +20828,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 ;; @@ -18837,6 +20842,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*) @@ -18874,7 +20900,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 @@ -18884,13 +20910,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 @@ -18899,23 +20925,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 @@ -18929,13 +21002,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= @@ -18945,24 +21045,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) @@ -18974,7 +21069,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 @@ -18996,9 +21091,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 @@ -19015,7 +21122,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` @@ -19034,8 +21141,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 @@ -19043,22 +21154,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 @@ -19074,24 +21186,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -19105,19 +21229,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$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 @@ -19136,24 +21261,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -19167,8 +21304,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$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -19177,13 +21316,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 ;; @@ -19196,7 +21333,7 @@ ld_shlibs_GCJ=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_GCJ=-rdynamic ;; @@ -19206,68 +21343,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 ;; @@ -19301,8 +21438,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 @@ -19310,7 +21447,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 @@ -19324,47 +21461,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' @@ -19378,7 +21530,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' @@ -19388,7 +21540,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 @@ -19411,7 +21563,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 @@ -19421,7 +21574,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 @@ -19432,14 +21585,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' @@ -19451,13 +21604,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' @@ -19465,21 +21618,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' @@ -19488,8 +21635,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 ;; @@ -19498,7 +21655,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 @@ -19546,36 +21703,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*) @@ -19590,15 +21756,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? # @@ -19616,8 +21777,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 @@ -19631,6 +21792,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= @@ -19653,20 +21815,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= @@ -19676,7 +21838,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 @@ -19741,7 +21916,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*) @@ -19750,7 +21925,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}' @@ -19766,7 +21941,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -19778,7 +21953,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' @@ -19808,7 +21984,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 ;; @@ -19831,7 +22007,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"` @@ -19854,20 +22030,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*) @@ -19885,1174 +22058,391 @@ 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 - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - esac - ;; - -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 - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case "$host_cpu" in - ia64*) - shrext='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux*) - 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 - - # 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, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - 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}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - 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=yes - ;; - -openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - 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 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - 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 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - 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 - 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=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - 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' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -uts4*) - 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' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -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 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # 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 - + 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 + ;; - 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" +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 + hardcode_into_libs=yes + ;; - 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 +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 + ;; -#include +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -/* 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 +# This must be Linux ELF. +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' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # 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 -#ifdef __cplusplus -extern "C" void exit (int); -#endif + # 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 -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; + # 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, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +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' + ;; - 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 +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + 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}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' fi -fi -rm -fr conftest* - + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; - 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 +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=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 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; -#include +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + 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 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -/* 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 +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -#ifdef __cplusplus -extern "C" void exit (int); -#endif +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +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' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; - 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 ;; +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 - else : - # compilation failed - lt_cv_dlopen_self_static=no fi -fi -rm -fr conftest* + 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}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; +*) + dynamic_linker=no + ;; +esac +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +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 -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 +{ 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 - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +{ 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 @@ -21069,7 +22459,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 \ @@ -21169,6 +22560,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 @@ -21180,6 +22577,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_GCJ @@ -21199,7 +22599,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 @@ -21230,7 +22630,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -21245,7 +22645,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? @@ -21447,7 +22847,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 @@ -21467,7 +22870,6 @@ RC) - # Source file extension for RC test sources. ac_ext=rc @@ -21486,15 +22888,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 @@ -21510,7 +22939,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 \ @@ -21610,6 +23040,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 @@ -21621,6 +23057,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -21640,7 +23079,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 @@ -21671,7 +23110,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -21686,7 +23125,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? @@ -21888,7 +23327,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 @@ -21935,7 +23377,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 @@ -21990,8 +23432,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 @@ -22017,17 +23459,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 @@ -22042,32 +23484,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_executable_p "$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 @@ -22076,8 +23519,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 @@ -22103,11 +23546,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 @@ -22115,8 +23558,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 @@ -22210,8 +23653,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' @@ -22223,8 +23665,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 @@ -22252,24 +23694,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -22278,15 +23732,16 @@ 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 @@ -22315,15 +23770,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' @@ -22363,24 +23817,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -22389,9 +23855,10 @@ 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 @@ -22404,11 +23871,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 @@ -22429,8 +23896,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' @@ -22468,24 +23934,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -22495,10 +23973,11 @@ 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$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -22511,8 +23990,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 @@ -22536,15 +24015,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' @@ -22583,24 +24061,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -22609,9 +24099,10 @@ 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 @@ -22624,11 +24115,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 @@ -22649,8 +24140,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' @@ -22687,24 +24177,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -22714,10 +24216,11 @@ 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$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -22730,8 +24233,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 @@ -22754,8 +24257,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 @@ -22772,30 +24275,42 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -22804,20 +24319,21 @@ 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$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 @@ -22834,30 +24350,42 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -22866,21 +24394,22 @@ 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$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 @@ -22893,40 +24422,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -22935,19 +24476,20 @@ 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$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 @@ -22960,40 +24502,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23002,14 +24556,15 @@ 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$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 @@ -23035,13 +24590,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' @@ -23070,24 +24625,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -23099,8 +24666,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' @@ -23110,17 +24679,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' @@ -23149,24 +24718,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -23178,8 +24759,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' @@ -23190,8 +24773,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 @@ -23204,8 +24787,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 @@ -23218,40 +24801,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23260,21 +24855,22 @@ 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$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 @@ -23287,40 +24883,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23329,21 +24937,22 @@ 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$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 @@ -23370,53 +24979,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23425,17 +25040,18 @@ 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$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 @@ -23448,40 +25064,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23490,21 +25118,22 @@ 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$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 @@ -23531,53 +25160,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23586,17 +25221,18 @@ 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$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 @@ -23609,40 +25245,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23651,22 +25299,23 @@ 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$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 @@ -23693,53 +25342,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23748,17 +25403,18 @@ 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$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 @@ -23771,40 +25427,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23813,14 +25481,15 @@ 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$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 @@ -23828,8 +25497,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 @@ -23856,53 +25525,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23911,18 +25586,19 @@ 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$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 @@ -23935,40 +25611,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -23977,14 +25665,15 @@ 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$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 @@ -23998,18 +25687,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 @@ -24020,24 +25710,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -24046,15 +25748,16 @@ 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 @@ -24063,8 +25766,13 @@ /* 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 @@ -24088,9 +25796,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 @@ -24114,25 +25823,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 @@ -24150,18 +25853,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 @@ -24172,24 +25876,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -24198,15 +25914,16 @@ 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 @@ -24215,8 +25932,13 @@ /* 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 @@ -24240,9 +25962,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 @@ -24266,25 +25989,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 @@ -24298,8 +26015,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 @@ -24312,40 +26029,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -24354,14 +26083,15 @@ 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$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 @@ -24372,18 +26102,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 @@ -24394,24 +26125,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -24420,15 +26163,16 @@ 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 @@ -24437,8 +26181,13 @@ /* 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 @@ -24462,9 +26211,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 @@ -24488,25 +26238,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 @@ -24521,17 +26265,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 @@ -24542,24 +26286,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -24568,15 +26324,16 @@ 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 @@ -24585,8 +26342,13 @@ /* 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 @@ -24610,9 +26372,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 @@ -24636,25 +26399,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 @@ -24671,8 +26427,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 @@ -24698,31 +26454,43 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 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 @@ -24733,25 +26501,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$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' @@ -24791,24 +26559,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -24817,9 +26597,10 @@ 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 @@ -24832,11 +26613,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 @@ -24857,8 +26638,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' @@ -24896,24 +26676,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -24923,10 +26715,11 @@ 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$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -24939,8 +26732,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 @@ -24967,8 +26760,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 @@ -24981,40 +26774,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -25023,27 +26828,28 @@ 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$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 @@ -25056,40 +26862,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -25098,22 +26916,23 @@ 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$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 @@ -25124,36 +26943,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25162,20 +26994,21 @@ 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 +{ 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 + # 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. @@ -25188,10 +27021,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 ; @@ -25199,24 +27033,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25229,10 +27075,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 ; @@ -25240,24 +27087,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25266,30 +27125,32 @@ 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 ; @@ -25297,24 +27158,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25327,10 +27200,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 ; @@ -25338,24 +27212,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25364,24 +27250,27 @@ 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` @@ -25392,10 +27281,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 ; @@ -25403,24 +27293,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25429,26 +27331,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -25456,8 +27352,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 @@ -25466,35 +27363,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 @@ -25505,28 +27411,27 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +{ { 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; }; } 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 @@ -25537,36 +27442,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25575,20 +27493,21 @@ 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 +{ 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 + # 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. @@ -25601,10 +27520,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 ; @@ -25612,24 +27532,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25642,10 +27574,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 ; @@ -25653,24 +27586,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25679,30 +27624,32 @@ 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 ; @@ -25710,24 +27657,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25740,10 +27699,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 ; @@ -25751,24 +27711,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25777,24 +27749,27 @@ 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` @@ -25805,10 +27780,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 ; @@ -25816,24 +27792,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25842,26 +27830,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -25869,8 +27851,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 @@ -25879,35 +27862,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 @@ -25918,28 +27910,27 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +{ { 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; }; } 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 @@ -25950,36 +27941,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -25988,20 +27992,21 @@ 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 +{ 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 + # 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. @@ -26014,10 +28019,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 ; @@ -26025,24 +28031,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26055,10 +28073,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 ; @@ -26066,24 +28085,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26092,30 +28123,32 @@ 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 ; @@ -26123,24 +28156,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26153,10 +28198,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 ; @@ -26164,24 +28210,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26190,24 +28248,27 @@ 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` @@ -26218,10 +28279,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 ; @@ -26229,24 +28291,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26255,26 +28329,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -26282,8 +28350,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 @@ -26292,35 +28361,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 @@ -26331,28 +28409,27 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +{ { 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; }; } 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 @@ -26363,36 +28440,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26401,20 +28491,21 @@ 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 +{ 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 + # 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. @@ -26427,10 +28518,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 ; @@ -26438,24 +28530,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26468,10 +28572,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 ; @@ -26479,24 +28584,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26505,30 +28622,32 @@ 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 ; @@ -26536,24 +28655,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26566,10 +28697,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 ; @@ -26577,24 +28709,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26603,24 +28747,27 @@ 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` @@ -26631,10 +28778,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 ; @@ -26642,24 +28790,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26668,26 +28828,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -26695,8 +28849,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 @@ -26705,35 +28860,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 @@ -26744,30 +28908,29 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +{ { 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; }; } 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 @@ -26780,40 +28943,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -26822,14 +28997,15 @@ 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$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" @@ -26838,8 +29014,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 @@ -26852,40 +29028,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -26894,14 +29082,15 @@ 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$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" @@ -26915,8 +29104,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 @@ -26927,36 +29116,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -26965,20 +29167,21 @@ 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 +{ 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 + # 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. @@ -26991,10 +29194,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 ; @@ -27002,24 +29206,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27032,10 +29248,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 ; @@ -27043,24 +29260,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27069,30 +29298,32 @@ 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 ; @@ -27100,24 +29331,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27130,10 +29373,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 ; @@ -27141,24 +29385,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27167,24 +29423,27 @@ 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` @@ -27195,10 +29454,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 ; @@ -27206,24 +29466,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27232,26 +29504,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -27259,8 +29525,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 @@ -27269,35 +29536,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 @@ -27308,29 +29584,28 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +{ { 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; }; } 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 @@ -27341,36 +29616,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27379,20 +29667,21 @@ 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 +{ 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 + # 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. @@ -27405,10 +29694,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 ; @@ -27416,24 +29706,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27446,10 +29748,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 ; @@ -27457,24 +29760,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27483,30 +29798,32 @@ 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 ; @@ -27514,24 +29831,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27544,10 +29873,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 ; @@ -27555,24 +29885,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27581,24 +29923,27 @@ 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` @@ -27609,10 +29954,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 ; @@ -27620,24 +29966,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27646,26 +30004,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -27673,8 +30025,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 @@ -27683,35 +30036,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 @@ -27722,30 +30084,29 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +{ { 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; }; } 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 @@ -27766,36 +30127,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 - 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; } { { 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! @@ -27807,18 +30180,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' @@ -27848,24 +30221,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -27874,9 +30259,10 @@ 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$ac_exeext conftest.$ac_ext CXXFLAGS=$safe_CXXFLAGS @@ -27889,26 +30275,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="" @@ -27927,18 +30313,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 @@ -27949,24 +30336,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -27975,15 +30374,16 @@ 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 @@ -27992,8 +30392,13 @@ /* 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 @@ -28017,9 +30422,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 @@ -28043,25 +30449,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 @@ -28073,8 +30473,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 @@ -28101,53 +30501,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -28156,13 +30562,14 @@ 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$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 @@ -28183,9 +30590,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 @@ -28211,53 +30618,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -28266,13 +30679,15 @@ 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$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 @@ -28289,32 +30704,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 @@ -28330,8 +30745,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 @@ -28368,8 +30783,13 @@ /* 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 @@ -28436,6 +30856,7 @@ fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = NO @@ -28465,24 +30886,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -28493,7 +30926,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}/` \ @@ -28541,7 +30974,8 @@ done done fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = NO @@ -28551,21 +30985,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 @@ -28573,7 +31012,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 @@ -28582,7 +31021,7 @@ esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi if test -z "$ac_x_includes"; then @@ -28626,12 +31065,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 @@ -28659,8 +31098,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 @@ -28673,40 +31112,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -28715,14 +31166,15 @@ 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$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 @@ -28731,8 +31183,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 @@ -28766,24 +31218,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -28792,10 +31256,11 @@ 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$ac_exeext conftest.$ac_ext LDFLAGS=$kde_ldflags_safe @@ -28804,8 +31269,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 @@ -28867,8 +31332,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" @@ -28879,9 +31344,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 @@ -28893,40 +31358,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -28935,14 +31412,16 @@ 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$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 @@ -28955,8 +31434,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 @@ -28969,40 +31448,52 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -29011,14 +31502,15 @@ 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$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 @@ -29026,8 +31518,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 @@ -29046,40 +31538,53 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 - 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$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs fi @@ -29094,16 +31599,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' @@ -29130,24 +31634,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -29156,8 +31672,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -29170,13 +31688,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 @@ -29188,16 +31706,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' @@ -29224,24 +31741,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -29250,8 +31779,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$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -29264,13 +31795,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 @@ -29297,17 +31828,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 @@ -29325,21 +31856,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 @@ -29358,14 +31889,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 @@ -29399,24 +31930,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -29425,9 +31968,10 @@ 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$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" @@ -29440,8 +31984,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 @@ -29461,8 +32005,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 @@ -29498,24 +32042,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -29524,10 +32080,11 @@ 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$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" @@ -29541,19 +32098,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 @@ -29586,24 +32143,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -29612,9 +32181,10 @@ 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$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" @@ -29624,14 +32194,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 @@ -29664,24 +32234,36 @@ } _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -29690,9 +32272,10 @@ 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$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" @@ -29702,11 +32285,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= @@ -29726,7 +32309,7 @@ do for j in jpeglib.h; do - echo "configure: 29729: $i/$j" >&5 + echo "configure: 32312: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 jpeg_incdir=$i @@ -29773,14 +32356,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 @@ -29823,8 +32406,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 @@ -29833,8 +32416,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 @@ -29848,10 +32431,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 @@ -29861,7 +32443,8 @@ fi -fi; +fi + USING_QT_MT="" @@ -29881,13 +32464,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 @@ -29959,8 +32542,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" @@ -29969,34 +32552,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. +# Check whether --with-qt-includes was given. if test "${with_qt_includes+set}" = set; then - withval="$with_qt_includes" - + 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 @@ -30024,7 +32607,7 @@ do for j in $kde_qt_header; do - echo "configure: 30027: $i/$j" >&5 + echo "configure: 32610: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 qt_incdir=$i @@ -30061,8 +32644,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' @@ -30199,13 +32781,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" @@ -30214,15 +32796,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' @@ -30343,12 +32924,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 @@ -30386,14 +32967,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 @@ -30436,8 +33017,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. @@ -30458,22 +33039,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 @@ -30516,12 +33097,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 @@ -30551,10 +33132,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 @@ -30577,22 +33158,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 @@ -30615,13 +33196,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 @@ -30652,15 +33233,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' @@ -30693,24 +33273,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -30719,9 +33311,10 @@ 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$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CXXFLAGS="$ac_save_CXXFLAGS" @@ -30737,12 +33330,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 @@ -30773,15 +33366,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 @@ -30805,11 +33398,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} @@ -30861,7 +33454,7 @@ do for j in $kde_check_header; do - echo "configure: 30864: $i/$j" >&5 + echo "configure: 33457: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_incdir=$i @@ -30891,7 +33484,7 @@ do for j in $kde_check_lib; do - echo "configure: 30894: $i/$j" >&5 + echo "configure: 33487: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_libdir=$i @@ -30909,7 +33502,7 @@ do for j in "kde3/plugins/designer/kdewidgets.la"; do - echo "configure: 30912: $i/$j" >&5 + echo "configure: 33505: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_widgetdir=$i @@ -30968,12 +33561,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}" @@ -30982,8 +33575,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" @@ -31021,8 +33614,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 @@ -31065,8 +33658,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. @@ -31098,10 +33691,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="" @@ -31115,13 +33707,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 @@ -31232,15 +33825,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' @@ -31292,8 +33884,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. @@ -31332,8 +33924,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 @@ -31341,8 +33933,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 @@ -31535,15 +34127,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' @@ -31595,8 +34186,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. @@ -31635,8 +34226,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 @@ -31644,8 +34235,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 @@ -31737,22 +34328,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 @@ -31785,14 +34376,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 @@ -31835,8 +34426,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. @@ -31847,21 +34438,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 @@ -31904,8 +34495,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. @@ -31916,22 +34507,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 @@ -31974,8 +34565,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 @@ -31988,21 +34579,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 @@ -32045,8 +34636,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 @@ -32059,22 +34650,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 @@ -32117,12 +34708,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 @@ -32151,14 +34742,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 @@ -32201,8 +34792,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. @@ -32213,21 +34804,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 @@ -32270,8 +34861,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. @@ -32282,8 +34873,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 @@ -32291,14 +34882,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 @@ -32341,8 +34932,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. @@ -32353,8 +34944,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 @@ -32362,14 +34953,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 @@ -32412,12 +35003,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 @@ -32432,7 +35023,7 @@ do for j in apps/ksgmltools2/customization/kde-chunk.xsl; do - echo "configure: 32435: $i/$j" >&5 + echo "configure: 35026: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 KDE_XSL_STYLESHEET=$i @@ -32602,8 +35193,8 @@ fi -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" @@ -32615,7 +35206,7 @@ do for j in qsql.html; do - echo "configure: 32618: $i/$j" >&5 + echo "configure: 35209: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 QTDOCDIR=$i @@ -32624,20 +35215,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 @@ -32680,12 +35271,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 @@ -32697,14 +35288,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 @@ -32747,12 +35338,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 @@ -32781,8 +35372,8 @@ # 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_prog_PKGCONFIGFOUND+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32795,26 +35386,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_PKGCONFIGFOUND="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi PKGCONFIGFOUND=$ac_cv_prog_PKGCONFIGFOUND if test -n "$PKGCONFIGFOUND"; then - echo "$as_me:$LINENO: result: $PKGCONFIGFOUND" >&5 -echo "${ECHO_T}$PKGCONFIGFOUND" >&6 + { echo "$as_me:$LINENO: result: $PKGCONFIGFOUND" >&5 +echo "${ECHO_T}$PKGCONFIGFOUND" >&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 + ############################################################################### # END PKG-CONFIG CHECK ############################################################################### @@ -32830,8 +35423,8 @@ # Extract the first word of "taglib-config", so it can be a program name with args. set dummy taglib-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_TAGLIB_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32846,29 +35439,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_TAGLIB_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_TAGLIB_CONFIG" && ac_cv_path_TAGLIB_CONFIG="no" ;; esac fi TAGLIB_CONFIG=$ac_cv_path_TAGLIB_CONFIG - if test -n "$TAGLIB_CONFIG"; then - echo "$as_me:$LINENO: result: $TAGLIB_CONFIG" >&5 -echo "${ECHO_T}$TAGLIB_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $TAGLIB_CONFIG" >&5 +echo "${ECHO_T}$TAGLIB_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 + if test "x$TAGLIB_CONFIG" = "xno" ; then amarok_error_notaglib=yes DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" @@ -32950,21 +35544,21 @@ ############################################################################### -# Check whether --with-xine or --without-xine was given. +# Check whether --with-xine was given. if test "${with_xine+set}" = set; then - withval="$with_xine" - build_xine=$withval + withval=$with_xine; build_xine=$withval else build_xine=yes -fi; +fi + if test "$build_xine" != "no"; then # Extract the first word of "xine-config", so it can be a program name with args. set dummy xine-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_prog_XINE_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32977,26 +35571,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_XINE_CONFIG="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi XINE_CONFIG=$ac_cv_prog_XINE_CONFIG if test -n "$XINE_CONFIG"; then - echo "$as_me:$LINENO: result: $XINE_CONFIG" >&5 -echo "${ECHO_T}$XINE_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $XINE_CONFIG" >&5 +echo "${ECHO_T}$XINE_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 + if test x$XINE_CONFIG = xyes ; then cat >>confdefs.h <<\_ACEOF @@ -33015,8 +35611,8 @@ xine_rc_version=`sed -ne '/^#define XINE_VERSION/s/.*-rc\([0-9]\+\).*/\1/p' $xine_include/xine.h` : ${xine_rc_version:=4} # if this is no rc version, it fulfills the requirements - echo "$as_me:$LINENO: checking for xine-lib version >= 1.0.2" >&5 -echo $ECHO_N "checking for xine-lib version >= 1.0.2... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for xine-lib version >= 1.0.2" >&5 +echo $ECHO_N "checking for xine-lib version >= 1.0.2... $ECHO_C" >&6; } if test $xine_version -eq $xine_version_min \ -a $xine_rc_version -gt 3 \ @@ -33110,24 +35706,24 @@ ############################################################################### -# Check whether --with-nmm or --without-nmm was given. +# Check whether --with-nmm was given. if test "${with_nmm+set}" = set; then - withval="$with_nmm" - build_nmm=$withval + withval=$with_nmm; build_nmm=$withval else build_nmm=no -fi; +fi + -# Check whether --with-nmm-dir or --without-nmm-dir was given. +# Check whether --with-nmm-dir was given. if test "${with_nmm_dir+set}" = set; then - withval="$with_nmm_dir" - nmm_dir="$withval" + withval=$with_nmm_dir; nmm_dir="$withval" else nmm_dir=/usr/local -fi; +fi + if test "$build_nmm" != "no"; then @@ -33204,18 +35800,18 @@ ############################################################################### -# Check whether --with-helix or --without-helix was given. +# Check whether --with-helix was given. if test "${with_helix+set}" = set; then - withval="$with_helix" - build_helix=$withval + withval=$with_helix; build_helix=$withval else build_helix=no -fi; +fi + if test "$build_helix" != "no"; then - echo "$as_me:$LINENO: checking for RealPlayer or HelixPlayer" >&5 -echo $ECHO_N "checking for RealPlayer or HelixPlayer... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for RealPlayer or HelixPlayer" >&5 +echo $ECHO_N "checking for RealPlayer or HelixPlayer... $ECHO_C" >&6; } if test "$build_helix" = "yes"; then HXPLAY=`type -p hxplay` @@ -33225,8 +35821,8 @@ HELIX_LINK=`dirname $HELIX_LINK` HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd` if test -e "$HELIX_LIBS/common/clntcore.so"; then - echo "$as_me:$LINENO: result: found RealPlayer in $HELIX_LIBS" >&5 -echo "${ECHO_T}found RealPlayer in $HELIX_LIBS" >&6 + { echo "$as_me:$LINENO: result: found RealPlayer in $HELIX_LIBS" >&5 +echo "${ECHO_T}found RealPlayer in $HELIX_LIBS" >&6; } build_helix=$HELIX_LIBS fi elif test "$HXPLAY" != "" -a -x "$HXPLAY"; then @@ -33234,8 +35830,8 @@ HELIX_LINK=`dirname $HELIX_LINK` HELIX_LIBS=`unset CDPATH; cd $HELIX_LINK && pwd` if test -e "$HELIX_LIBS/common/clntcore.so"; then - echo "$as_me:$LINENO: result: found HelixPlayer in $HELIX_LIBS" >&5 -echo "${ECHO_T}found HelixPlayer in $HELIX_LIBS" >&6 + { echo "$as_me:$LINENO: result: found HelixPlayer in $HELIX_LIBS" >&5 +echo "${ECHO_T}found HelixPlayer in $HELIX_LIBS" >&6; } build_helix=$HELIX_LIBS fi fi @@ -33246,8 +35842,8 @@ HELIX_LIBS="$build_helix" fi build_helix=$HELIX_LIBS - echo "$as_me:$LINENO: result: using $HELIX_LIBS" >&5 -echo "${ECHO_T}using $HELIX_LIBS" >&6 + { echo "$as_me:$LINENO: result: using $HELIX_LIBS" >&5 +echo "${ECHO_T}using $HELIX_LIBS" >&6; } fi @@ -33257,8 +35853,8 @@ if test "$build_helix" = "yes"; then HELIX_LIBS="/usr/local/RealPlayer" - echo "$as_me:$LINENO: result: \"not found, using default dir\"" >&5 -echo "${ECHO_T}\"not found, using default dir\"" >&6 + { echo "$as_me:$LINENO: result: \"not found, using default dir\"" >&5 +echo "${ECHO_T}\"not found, using default dir\"" >&6; } fi cat >>confdefs.h <<_ACEOF @@ -33272,8 +35868,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 @@ -33288,28 +35884,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_executable_p "$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 @@ -33320,25 +35917,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 alsa" >&5 -echo $ECHO_N "checking for alsa... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for alsa" >&5 +echo $ECHO_N "checking for alsa... $ECHO_C" >&6; } if $PKG_CONFIG --exists "alsa" ; 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 ALSALIB_CFLAGS" >&5 -echo $ECHO_N "checking ALSALIB_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking ALSALIB_CFLAGS" >&5 +echo $ECHO_N "checking ALSALIB_CFLAGS... $ECHO_C" >&6; } ALSALIB_CFLAGS=`$PKG_CONFIG --cflags "alsa"` - echo "$as_me:$LINENO: result: $ALSALIB_CFLAGS" >&5 -echo "${ECHO_T}$ALSALIB_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $ALSALIB_CFLAGS" >&5 +echo "${ECHO_T}$ALSALIB_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking ALSALIB_LIBS" >&5 -echo $ECHO_N "checking ALSALIB_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking ALSALIB_LIBS" >&5 +echo $ECHO_N "checking ALSALIB_LIBS... $ECHO_C" >&6; } ALSALIB_LIBS=`$PKG_CONFIG --libs "alsa"` - echo "$as_me:$LINENO: result: $ALSALIB_LIBS" >&5 -echo "${ECHO_T}$ALSALIB_LIBS" >&6 + { echo "$as_me:$LINENO: result: $ALSALIB_LIBS" >&5 +echo "${ECHO_T}$ALSALIB_LIBS" >&6; } else ALSALIB_CFLAGS="" ALSALIB_LIBS="" @@ -33397,18 +35994,19 @@ for ac_header in linux/inotify.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 @@ -33419,24 +36017,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -33445,15 +36055,16 @@ 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 @@ -33462,8 +36073,13 @@ /* 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 @@ -33487,9 +36103,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 @@ -33513,25 +36130,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 @@ -33563,25 +36174,24 @@ ############################################################################### -# Check whether --with-opengl or --without-opengl was given. +# Check whether --with-opengl was given. if test "${with_opengl+set}" = set; then - withval="$with_opengl" - build_opengl=$withval + withval=$with_opengl; build_opengl=$withval else build_opengl=yes -fi; +fi + if test "$build_opengl" != "no"; then - echo "$as_me:$LINENO: checking for Qt with OpenGL support" >&5 -echo $ECHO_N "checking for Qt with OpenGL support... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for Qt with OpenGL support" >&5 +echo $ECHO_N "checking for Qt with OpenGL support... $ECHO_C" >&6; } if test "${ac_cv_kde_qt_has_opengl+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' @@ -33619,24 +36229,36 @@ } _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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -33645,9 +36267,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_kde_qt_has_opengl=no + ac_cv_kde_qt_has_opengl=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" @@ -33662,8 +36285,8 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_kde_qt_has_opengl" >&5 -echo "${ECHO_T}$ac_cv_kde_qt_has_opengl" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_kde_qt_has_opengl" >&5 +echo "${ECHO_T}$ac_cv_kde_qt_has_opengl" >&6; } if test x$ac_cv_kde_qt_has_opengl = xyes; then @@ -33692,14 +36315,14 @@ LIB_SQLITE="" -# Check whether --with-included-sqlite or --without-included-sqlite was given. +# Check whether --with-included-sqlite was given. if test "${with_included_sqlite+set}" = set; then - withval="$with_included_sqlite" - included_sqlite=$withval + withval=$with_included_sqlite; included_sqlite=$withval else included_sqlite=yes -fi; +fi + if test x$included_sqlite = xno; then if test x$PKGCONFIGFOUND = xyes; then @@ -33709,8 +36332,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 @@ -33725,28 +36348,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_executable_p "$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 @@ -33757,25 +36381,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 sqlite3 >= 3.0" >&5 -echo $ECHO_N "checking for sqlite3 >= 3.0... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sqlite3 >= 3.0" >&5 +echo $ECHO_N "checking for sqlite3 >= 3.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "sqlite3 >= 3.0" ; 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 SQLITE_CFLAGS" >&5 -echo $ECHO_N "checking SQLITE_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking SQLITE_CFLAGS" >&5 +echo $ECHO_N "checking SQLITE_CFLAGS... $ECHO_C" >&6; } SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.0"` - echo "$as_me:$LINENO: result: $SQLITE_CFLAGS" >&5 -echo "${ECHO_T}$SQLITE_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $SQLITE_CFLAGS" >&5 +echo "${ECHO_T}$SQLITE_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking SQLITE_LIBS" >&5 -echo $ECHO_N "checking SQLITE_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking SQLITE_LIBS" >&5 +echo $ECHO_N "checking SQLITE_LIBS... $ECHO_C" >&6; } SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.0"` - echo "$as_me:$LINENO: result: $SQLITE_LIBS" >&5 -echo "${ECHO_T}$SQLITE_LIBS" >&6 + { echo "$as_me:$LINENO: result: $SQLITE_LIBS" >&5 +echo "${ECHO_T}$SQLITE_LIBS" >&6; } else SQLITE_CFLAGS="" SQLITE_LIBS="" @@ -33826,8 +36450,8 @@ # Determine pointer size for sqlite - 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 @@ -33838,36 +36462,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -33876,20 +36513,21 @@ 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 +{ 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 + # 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. @@ -33902,10 +36540,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 ; @@ -33913,24 +36552,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -33943,10 +36594,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 ; @@ -33954,24 +36606,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -33980,30 +36644,32 @@ 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 ; @@ -34011,24 +36677,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34041,10 +36719,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 ; @@ -34052,24 +36731,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34078,24 +36769,27 @@ 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` @@ -34106,10 +36800,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 ; @@ -34117,24 +36812,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34143,26 +36850,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -34170,8 +36871,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 @@ -34180,35 +36882,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 @@ -34219,28 +36930,27 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +{ { 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; }; } 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 @@ -34251,36 +36961,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34289,20 +37012,21 @@ 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 +{ 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 + # 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. @@ -34315,10 +37039,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 ; @@ -34326,24 +37051,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34356,10 +37093,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 ; @@ -34367,24 +37105,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34393,30 +37143,32 @@ 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 ; @@ -34424,24 +37176,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34454,10 +37218,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 ; @@ -34465,24 +37230,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34491,24 +37268,27 @@ 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` @@ -34519,10 +37299,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 ; @@ -34530,24 +37311,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34556,26 +37349,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -34583,8 +37370,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 @@ -34593,35 +37381,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 @@ -34632,28 +37429,27 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +{ { 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; }; } 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 @@ -34664,36 +37460,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34702,20 +37511,21 @@ 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 +{ 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 + # 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. @@ -34728,10 +37538,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 ; @@ -34739,24 +37550,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34769,10 +37592,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 ; @@ -34780,24 +37604,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34806,30 +37642,32 @@ 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 ; @@ -34837,24 +37675,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34867,10 +37717,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 ; @@ -34878,24 +37729,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34904,24 +37767,27 @@ 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` @@ -34932,10 +37798,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 ; @@ -34943,24 +37810,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -34969,26 +37848,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -34996,8 +37869,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 @@ -35006,35 +37880,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 @@ -35045,28 +37928,27 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +{ { 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; }; } 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 @@ -35077,36 +37959,49 @@ 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -35115,20 +38010,21 @@ 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 +{ 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 + # 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. @@ -35141,10 +38037,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 ; @@ -35152,24 +38049,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -35182,10 +38091,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 ; @@ -35193,24 +38103,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -35219,30 +38141,32 @@ 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 ; @@ -35250,24 +38174,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -35280,10 +38216,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 ; @@ -35291,24 +38228,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -35317,24 +38266,27 @@ 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` @@ -35345,10 +38297,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 ; @@ -35356,24 +38309,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -35382,26 +38347,20 @@ 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 +'') { { 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; }; } ;; 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 @@ -35409,8 +38368,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 @@ -35419,35 +38379,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 @@ -35458,22 +38427,21 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +{ { 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; }; } 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 @@ -35495,21 +38463,21 @@ # BEGIN MYSQL CHECK ############################################################################### -# Check whether --enable-mysql or --disable-mysql was given. +# Check whether --enable-mysql was given. if test "${enable_mysql+set}" = set; then - enableval="$enable_mysql" - enable_mysql=$enableval + enableval=$enable_mysql; enable_mysql=$enableval else enable_mysql=no -fi; +fi + if test "$enable_mysql" = "yes"; then # Extract the first word of "mysql_config", so it can be a program name with args. set dummy mysql_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_prog_MYSQL_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35522,26 +38490,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MYSQL_CONFIG="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi MYSQL_CONFIG=$ac_cv_prog_MYSQL_CONFIG if test -n "$MYSQL_CONFIG"; then - echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5 -echo "${ECHO_T}$MYSQL_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5 +echo "${ECHO_T}$MYSQL_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 + if test x$MYSQL_CONFIG = xyes; then cat >>confdefs.h <<\_ACEOF @@ -35581,21 +38551,21 @@ # BEGIN POSTGRESQL CHECK ############################################################################### -# Check whether --enable-postgresql or --disable-postgresql was given. +# Check whether --enable-postgresql was given. if test "${enable_postgresql+set}" = set; then - enableval="$enable_postgresql" - enable_postgresql=$enableval + enableval=$enable_postgresql; enable_postgresql=$enableval else enable_postgresql=no -fi; +fi + if test "$enable_postgresql" = "yes"; then # Extract the first word of "pg_config", so it can be a program name with args. set dummy pg_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_prog_POSTGRESQL_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35608,26 +38578,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_POSTGRESQL_CONFIG="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi POSTGRESQL_CONFIG=$ac_cv_prog_POSTGRESQL_CONFIG if test -n "$POSTGRESQL_CONFIG"; then - echo "$as_me:$LINENO: result: $POSTGRESQL_CONFIG" >&5 -echo "${ECHO_T}$POSTGRESQL_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $POSTGRESQL_CONFIG" >&5 +echo "${ECHO_T}$POSTGRESQL_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 + if test x$POSTGRESQL_CONFIG = xyes; then cat >>confdefs.h <<\_ACEOF @@ -35673,20 +38645,20 @@ ############################################################################### -# Check whether --with-xmms or --without-xmms was given. +# Check whether --with-xmms was given. if test "${with_xmms+set}" = set; then - withval="$with_xmms" - with_xmms=$withval + withval=$with_xmms; with_xmms=$withval else with_xmms=yes -fi; +fi + if test "$with_xmms" = "yes"; then # Extract the first word of "xmms-config", so it can be a program name with args. set dummy xmms-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_prog_XMMS_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35699,26 +38671,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_XMMS_CONFIG="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi XMMS_CONFIG=$ac_cv_prog_XMMS_CONFIG if test -n "$XMMS_CONFIG"; then - echo "$as_me:$LINENO: result: $XMMS_CONFIG" >&5 -echo "${ECHO_T}$XMMS_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $XMMS_CONFIG" >&5 +echo "${ECHO_T}$XMMS_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 + if test x$XMMS_CONFIG = xyes; then xmms_plugin_path=`xmms-config --visualization-plugin-dir` xmms_cflags=`xmms-config --cflags` @@ -35736,8 +38710,8 @@ ## XMMSwrapper depends on gtk/gdk headers # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-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_prog_GTK_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35750,26 +38724,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_GTK_CONFIG="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi GTK_CONFIG=$ac_cv_prog_GTK_CONFIG if test -n "$GTK_CONFIG"; then - echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 +echo "${ECHO_T}$GTK_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 + if test x$XMMS_CONFIG = xyes -a x$GTK_CONFIG = xyes; then gtk_cflags=`gtk-config --cflags` gtk_libs=`gtk-config --libs` @@ -35809,21 +38785,21 @@ ############################################################################### -# Check whether --with-libvisual or --without-libvisual was given. +# Check whether --with-libvisual was given. if test "${with_libvisual+set}" = set; then - withval="$with_libvisual" - with_libvisual=$withval + withval=$with_libvisual; with_libvisual=$withval else with_libvisual=yes -fi; +fi + if test "$with_libvisual" = "yes"; then ## libvisual plugin depends on sdl # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-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_prog_SDL_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -35836,26 +38812,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_SDL_CONFIG="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi SDL_CONFIG=$ac_cv_prog_SDL_CONFIG if test -n "$SDL_CONFIG"; then - echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 -echo "${ECHO_T}$SDL_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 +echo "${ECHO_T}$SDL_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 + if test x$SDL_CONFIG = xyes; then sdl_cflags=`sdl-config --cflags` sdl_libs=`sdl-config --libs` @@ -35872,8 +38850,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 @@ -35888,28 +38866,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_executable_p "$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 @@ -35920,25 +38899,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 libvisual-0.4 >= 0.4.0" >&5 -echo $ECHO_N "checking for libvisual-0.4 >= 0.4.0... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libvisual-0.4 >= 0.4.0" >&5 +echo $ECHO_N "checking for libvisual-0.4 >= 0.4.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libvisual-0.4 >= 0.4.0" ; 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 LIBVISUAL_CFLAGS" >&5 -echo $ECHO_N "checking LIBVISUAL_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBVISUAL_CFLAGS" >&5 +echo $ECHO_N "checking LIBVISUAL_CFLAGS... $ECHO_C" >&6; } LIBVISUAL_CFLAGS=`$PKG_CONFIG --cflags "libvisual-0.4 >= 0.4.0"` - echo "$as_me:$LINENO: result: $LIBVISUAL_CFLAGS" >&5 -echo "${ECHO_T}$LIBVISUAL_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $LIBVISUAL_CFLAGS" >&5 +echo "${ECHO_T}$LIBVISUAL_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBVISUAL_LIBS" >&5 -echo $ECHO_N "checking LIBVISUAL_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBVISUAL_LIBS" >&5 +echo $ECHO_N "checking LIBVISUAL_LIBS... $ECHO_C" >&6; } LIBVISUAL_LIBS=`$PKG_CONFIG --libs "libvisual-0.4 >= 0.4.0"` - echo "$as_me:$LINENO: result: $LIBVISUAL_LIBS" >&5 -echo "${ECHO_T}$LIBVISUAL_LIBS" >&6 + { echo "$as_me:$LINENO: result: $LIBVISUAL_LIBS" >&5 +echo "${ECHO_T}$LIBVISUAL_LIBS" >&6; } else LIBVISUAL_CFLAGS="" LIBVISUAL_LIBS="" @@ -35998,28 +38977,28 @@ ############################################################################### -# Check whether --with-musicbrainz or --without-musicbrainz was given. +# Check whether --with-musicbrainz was given. if test "${with_musicbrainz+set}" = set; then - withval="$with_musicbrainz" - with_musicbrainz=$withval + withval=$with_musicbrainz; with_musicbrainz=$withval else with_musicbrainz=yes -fi; +fi + if test "$with_musicbrainz" = "yes"; then if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then - echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5 -echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5 +echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6; } if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5 -echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h usability" >&5 -echo $ECHO_N "checking tunepimp-0.5/tp_c.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h usability" >&5 +echo $ECHO_N "checking tunepimp-0.5/tp_c.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36030,24 +39009,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -36056,15 +39047,16 @@ 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 tunepimp-0.5/tp_c.h presence" >&5 -echo $ECHO_N "checking tunepimp-0.5/tp_c.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h presence" >&5 +echo $ECHO_N "checking tunepimp-0.5/tp_c.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36073,8 +39065,13 @@ /* 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 @@ -36098,9 +39095,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 @@ -36124,42 +39122,35 @@ echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: tunepimp-0.5/tp_c.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 tunepimp-0.5/tp_c.h" >&5 -echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5 +echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6; } if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_tunepimp_0_5_tp_c_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5 -echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6; } fi if test $ac_cv_header_tunepimp_0_5_tp_c_h = yes; then build_musicbrainz="yes" else if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then - echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5 -echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5 +echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6; } if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5 -echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking tunepimp/tp_c.h usability" >&5 -echo $ECHO_N "checking tunepimp/tp_c.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tunepimp/tp_c.h usability" >&5 +echo $ECHO_N "checking tunepimp/tp_c.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36170,24 +39161,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -36196,15 +39199,16 @@ 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 tunepimp/tp_c.h presence" >&5 -echo $ECHO_N "checking tunepimp/tp_c.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tunepimp/tp_c.h presence" >&5 +echo $ECHO_N "checking tunepimp/tp_c.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36213,8 +39217,13 @@ /* 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 @@ -36238,9 +39247,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 @@ -36264,25 +39274,18 @@ echo "$as_me: WARNING: tunepimp/tp_c.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: tunepimp/tp_c.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 tunepimp/tp_c.h" >&5 -echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5 +echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6; } if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_tunepimp_tp_c_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5 -echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5 +echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6; } fi if test $ac_cv_header_tunepimp_tp_c_h = yes; then @@ -36298,8 +39301,8 @@ fi if test "$build_musicbrainz" = "yes"; then - echo "$as_me:$LINENO: checking for tr_GetPUID in -ltunepimp" >&5 -echo $ECHO_N "checking for tr_GetPUID in -ltunepimp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tr_GetPUID in -ltunepimp" >&5 +echo $ECHO_N "checking for tr_GetPUID in -ltunepimp... $ECHO_C" >&6; } if test "${ac_cv_lib_tunepimp_tr_GetPUID+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -36312,40 +39315,52 @@ 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 tr_GetPUID (); int main () { -tr_GetPUID (); +return tr_GetPUID (); ; 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -36354,14 +39369,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_tunepimp_tr_GetPUID=no + ac_cv_lib_tunepimp_tr_GetPUID=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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_tunepimp_tr_GetPUID" >&5 -echo "${ECHO_T}$ac_cv_lib_tunepimp_tr_GetPUID" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tr_GetPUID" >&5 +echo "${ECHO_T}$ac_cv_lib_tunepimp_tr_GetPUID" >&6; } if test $ac_cv_lib_tunepimp_tr_GetPUID = yes; then cat >>confdefs.h <<\_ACEOF @@ -36369,8 +39385,8 @@ _ACEOF else - echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5 -echo $ECHO_N "checking for tp_SetFileNameEncoding in -ltunepimp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5 +echo $ECHO_N "checking for tp_SetFileNameEncoding in -ltunepimp... $ECHO_C" >&6; } if test "${ac_cv_lib_tunepimp_tp_SetFileNameEncoding+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -36383,40 +39399,52 @@ 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 tp_SetFileNameEncoding (); int main () { -tp_SetFileNameEncoding (); +return tp_SetFileNameEncoding (); ; 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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -36425,14 +39453,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_tunepimp_tp_SetFileNameEncoding=no + ac_cv_lib_tunepimp_tp_SetFileNameEncoding=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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_tunepimp_tp_SetFileNameEncoding" >&5 -echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&5 +echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&6; } if test $ac_cv_lib_tunepimp_tp_SetFileNameEncoding = yes; then cat >>confdefs.h <<\_ACEOF @@ -36473,14 +39502,14 @@ # BEGIN AMAZON CHECK ############################################################################### -# Check whether --enable-amazon or --disable-amazon was given. +# Check whether --enable-amazon was given. if test "${enable_amazon+set}" = set; then - enableval="$enable_amazon" - enable_amazon=$enableval + enableval=$enable_amazon; enable_amazon=$enableval else enable_amazon=yes -fi; +fi + if test "$enable_amazon" != "no"; then @@ -36500,12 +39529,11 @@ # BEGIN SCHED_SETAFFINITY BUGGY GLIBC CHECK ############################################################################### -echo "$as_me:$LINENO: checking if sched_setaffinity should be enabled" >&5 -echo $ECHO_N "checking if sched_setaffinity should be enabled... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if sched_setaffinity should be enabled" >&5 +echo $ECHO_N "checking if sched_setaffinity should be enabled... $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' @@ -36540,24 +39568,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -36566,10 +39606,11 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -amarok_sched_3params=no + amarok_sched_3params=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 "x$amarok_sched_3params" = "xyes"; then @@ -36609,24 +39650,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -36635,10 +39688,11 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -amarok_sched_2params=no + amarok_sched_2params=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 "x$amarok_sched_2params" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -36656,8 +39710,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: result: $amarok_glibcsched_works" >&5 -echo "${ECHO_T}$amarok_glibcsched_works" >&6 +{ echo "$as_me:$LINENO: result: $amarok_glibcsched_works" >&5 +echo "${ECHO_T}$amarok_glibcsched_works" >&6; } ############################################################################### # END SCHED_SETAFFINITY BUGGY GLIBC CHECK @@ -36674,8 +39728,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' @@ -36685,17 +39738,17 @@ if test "${ac_cv_header_konqsidebarplugin_h+set}" = set; then - echo "$as_me:$LINENO: checking for konqsidebarplugin.h" >&5 -echo $ECHO_N "checking for konqsidebarplugin.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for konqsidebarplugin.h" >&5 +echo $ECHO_N "checking for konqsidebarplugin.h... $ECHO_C" >&6; } if test "${ac_cv_header_konqsidebarplugin_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_konqsidebarplugin_h" >&5 -echo "${ECHO_T}$ac_cv_header_konqsidebarplugin_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_konqsidebarplugin_h" >&5 +echo "${ECHO_T}$ac_cv_header_konqsidebarplugin_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking konqsidebarplugin.h usability" >&5 -echo $ECHO_N "checking konqsidebarplugin.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking konqsidebarplugin.h usability" >&5 +echo $ECHO_N "checking konqsidebarplugin.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36706,24 +39759,36 @@ #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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -36732,15 +39797,16 @@ 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 konqsidebarplugin.h presence" >&5 -echo $ECHO_N "checking konqsidebarplugin.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking konqsidebarplugin.h presence" >&5 +echo $ECHO_N "checking konqsidebarplugin.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -36749,8 +39815,13 @@ /* 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 @@ -36774,9 +39845,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 @@ -36800,25 +39872,18 @@ echo "$as_me: WARNING: konqsidebarplugin.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: konqsidebarplugin.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: konqsidebarplugin.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 konqsidebarplugin.h" >&5 -echo $ECHO_N "checking for konqsidebarplugin.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for konqsidebarplugin.h" >&5 +echo $ECHO_N "checking for konqsidebarplugin.h... $ECHO_C" >&6; } if test "${ac_cv_header_konqsidebarplugin_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_konqsidebarplugin_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_konqsidebarplugin_h" >&5 -echo "${ECHO_T}$ac_cv_header_konqsidebarplugin_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_konqsidebarplugin_h" >&5 +echo "${ECHO_T}$ac_cv_header_konqsidebarplugin_h" >&6; } fi if test $ac_cv_header_konqsidebarplugin_h = yes; then @@ -36845,8 +39910,8 @@ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac - echo "$as_me:$LINENO: checking for _init in -lkonqsidebarplugin" >&5 -echo $ECHO_N "checking for _init in -lkonqsidebarplugin... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _init in -lkonqsidebarplugin" >&5 +echo $ECHO_N "checking for _init in -lkonqsidebarplugin... $ECHO_C" >&6; } if test "${ac_cv_lib_konqsidebarplugin__init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -36859,40 +39924,52 @@ 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 _init (); int main () { -_init (); +return _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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -36901,14 +39978,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_konqsidebarplugin__init=no + ac_cv_lib_konqsidebarplugin__init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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_konqsidebarplugin__init" >&5 -echo "${ECHO_T}$ac_cv_lib_konqsidebarplugin__init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_konqsidebarplugin__init" >&5 +echo "${ECHO_T}$ac_cv_lib_konqsidebarplugin__init" >&6; } if test $ac_cv_lib_konqsidebarplugin__init = yes; then have_konqsidebar=$have_konqsidebar else @@ -36942,14 +40020,14 @@ ### mediabrowser.cpp can use libnjb if available -# Check whether --with-libnjb or --without-libnjb was given. +# Check whether --with-libnjb was given. if test "${with_libnjb+set}" = set; then - withval="$with_libnjb" - build_libnjb=$withval + withval=$with_libnjb; build_libnjb=$withval else build_libnjb=yes -fi; +fi + if test "$build_libnjb" != "no"; then if test "$PKGCONFIGFOUND" = "yes" ; then @@ -36963,8 +40041,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 @@ -36979,28 +40057,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_executable_p "$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 @@ -37011,25 +40090,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 libnjb" >&5 -echo $ECHO_N "checking for libnjb... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libnjb" >&5 +echo $ECHO_N "checking for libnjb... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libnjb" ; 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 LIBNJB_CFLAGS" >&5 -echo $ECHO_N "checking LIBNJB_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBNJB_CFLAGS" >&5 +echo $ECHO_N "checking LIBNJB_CFLAGS... $ECHO_C" >&6; } LIBNJB_CFLAGS=`$PKG_CONFIG --cflags "libnjb"` - echo "$as_me:$LINENO: result: $LIBNJB_CFLAGS" >&5 -echo "${ECHO_T}$LIBNJB_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $LIBNJB_CFLAGS" >&5 +echo "${ECHO_T}$LIBNJB_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBNJB_LIBS" >&5 -echo $ECHO_N "checking LIBNJB_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBNJB_LIBS" >&5 +echo $ECHO_N "checking LIBNJB_LIBS... $ECHO_C" >&6; } LIBNJB_LIBS=`$PKG_CONFIG --libs "libnjb"` - echo "$as_me:$LINENO: result: $LIBNJB_LIBS" >&5 -echo "${ECHO_T}$LIBNJB_LIBS" >&6 + { echo "$as_me:$LINENO: result: $LIBNJB_LIBS" >&5 +echo "${ECHO_T}$LIBNJB_LIBS" >&6; } else LIBNJB_CFLAGS="" LIBNJB_LIBS="" @@ -37084,14 +40163,14 @@ ### mediabrowser.cpp can use libmtp if available -# Check whether --with-libmtp or --without-libmtp was given. +# Check whether --with-libmtp was given. if test "${with_libmtp+set}" = set; then - withval="$with_libmtp" - build_libmtp=$withval + withval=$with_libmtp; build_libmtp=$withval else build_libmtp=yes -fi; +fi + if test "$build_libmtp" != "no"; then if test "$PKGCONFIGFOUND" = "yes" ; then have_libmtp=no @@ -37102,8 +40181,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 @@ -37118,28 +40197,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_executable_p "$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 @@ -37150,25 +40230,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 libmtp >= 0.0.12" >&5 -echo $ECHO_N "checking for libmtp >= 0.0.12... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libmtp >= 0.0.12" >&5 +echo $ECHO_N "checking for libmtp >= 0.0.12... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libmtp >= 0.0.12" ; 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 LIBMTP_CFLAGS" >&5 -echo $ECHO_N "checking LIBMTP_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBMTP_CFLAGS" >&5 +echo $ECHO_N "checking LIBMTP_CFLAGS... $ECHO_C" >&6; } LIBMTP_CFLAGS=`$PKG_CONFIG --cflags "libmtp >= 0.0.12"` - echo "$as_me:$LINENO: result: $LIBMTP_CFLAGS" >&5 -echo "${ECHO_T}$LIBMTP_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $LIBMTP_CFLAGS" >&5 +echo "${ECHO_T}$LIBMTP_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBMTP_LIBS" >&5 -echo $ECHO_N "checking LIBMTP_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBMTP_LIBS" >&5 +echo $ECHO_N "checking LIBMTP_LIBS... $ECHO_C" >&6; } LIBMTP_LIBS=`$PKG_CONFIG --libs "libmtp >= 0.0.12"` - echo "$as_me:$LINENO: result: $LIBMTP_LIBS" >&5 -echo "${ECHO_T}$LIBMTP_LIBS" >&6 + { echo "$as_me:$LINENO: result: $LIBMTP_LIBS" >&5 +echo "${ECHO_T}$LIBMTP_LIBS" >&6; } else LIBMTP_CFLAGS="" LIBMTP_LIBS="" @@ -37199,8 +40279,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 @@ -37215,28 +40295,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_executable_p "$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 @@ -37247,25 +40328,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 libmtp < 0.0.12" >&5 -echo $ECHO_N "checking for libmtp < 0.0.12... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libmtp < 0.0.12" >&5 +echo $ECHO_N "checking for libmtp < 0.0.12... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libmtp < 0.0.12" ; 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 LIBMTP_CFLAGS" >&5 -echo $ECHO_N "checking LIBMTP_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBMTP_CFLAGS" >&5 +echo $ECHO_N "checking LIBMTP_CFLAGS... $ECHO_C" >&6; } LIBMTP_CFLAGS=`$PKG_CONFIG --cflags "libmtp < 0.0.12"` - echo "$as_me:$LINENO: result: $LIBMTP_CFLAGS" >&5 -echo "${ECHO_T}$LIBMTP_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $LIBMTP_CFLAGS" >&5 +echo "${ECHO_T}$LIBMTP_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBMTP_LIBS" >&5 -echo $ECHO_N "checking LIBMTP_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBMTP_LIBS" >&5 +echo $ECHO_N "checking LIBMTP_LIBS... $ECHO_C" >&6; } LIBMTP_LIBS=`$PKG_CONFIG --libs "libmtp < 0.0.12"` - echo "$as_me:$LINENO: result: $LIBMTP_LIBS" >&5 -echo "${ECHO_T}$LIBMTP_LIBS" >&6 + { echo "$as_me:$LINENO: result: $LIBMTP_LIBS" >&5 +echo "${ECHO_T}$LIBMTP_LIBS" >&6; } else LIBMTP_CFLAGS="" LIBMTP_LIBS="" @@ -37325,14 +40406,14 @@ ### mediabrowser.cpp can use libifp if available -# Check whether --with-ifp or --without-ifp was given. +# Check whether --with-ifp was given. if test "${with_ifp+set}" = set; then - withval="$with_ifp" - build_ifp=$withval + withval=$with_ifp; build_ifp=$withval else build_ifp=yes -fi; +fi + if test "$build_ifp" != "no"; then @@ -37340,18 +40421,19 @@ for ac_header in ifp.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 @@ -37362,24 +40444,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -37388,15 +40482,16 @@ 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 @@ -37405,8 +40500,13 @@ /* 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 @@ -37430,9 +40530,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 @@ -37456,25 +40557,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 @@ -37490,18 +40585,19 @@ for ac_header in usb.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 @@ -37512,24 +40608,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -37538,15 +40646,16 @@ 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 @@ -37555,8 +40664,13 @@ /* 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 @@ -37580,9 +40694,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 @@ -37606,25 +40721,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 @@ -37645,8 +40754,8 @@ IFP_LIBS="-lifp -lusb" else - echo "$as_me:$LINENO: result: $have_ifp" >&5 -echo "${ECHO_T}$have_ifp" >&6 + { echo "$as_me:$LINENO: result: $have_ifp" >&5 +echo "${ECHO_T}$have_ifp" >&6; } have_ifp=no fi @@ -37677,14 +40786,14 @@ ############################################################################### -# Check whether --with-libgpod or --without-libgpod was given. +# Check whether --with-libgpod was given. if test "${with_libgpod+set}" = set; then - withval="$with_libgpod" - build_libgpod=$withval + withval=$with_libgpod; build_libgpod=$withval else build_libgpod=yes -fi; +fi + if test "$build_libgpod" != "no"; then if test "$PKGCONFIGFOUND" = "yes" ; then @@ -37698,8 +40807,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 @@ -37714,28 +40823,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_executable_p "$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 @@ -37746,25 +40856,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 libgpod-1.0" >&5 -echo $ECHO_N "checking for libgpod-1.0... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libgpod-1.0" >&5 +echo $ECHO_N "checking for libgpod-1.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libgpod-1.0" ; 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 LIBGPOD_CFLAGS" >&5 -echo $ECHO_N "checking LIBGPOD_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBGPOD_CFLAGS" >&5 +echo $ECHO_N "checking LIBGPOD_CFLAGS... $ECHO_C" >&6; } LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0"` - echo "$as_me:$LINENO: result: $LIBGPOD_CFLAGS" >&5 -echo "${ECHO_T}$LIBGPOD_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $LIBGPOD_CFLAGS" >&5 +echo "${ECHO_T}$LIBGPOD_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBGPOD_LIBS" >&5 -echo $ECHO_N "checking LIBGPOD_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LIBGPOD_LIBS" >&5 +echo $ECHO_N "checking LIBGPOD_LIBS... $ECHO_C" >&6; } LIBGPOD_LIBS=`$PKG_CONFIG --libs "libgpod-1.0"` - echo "$as_me:$LINENO: result: $LIBGPOD_LIBS" >&5 -echo "${ECHO_T}$LIBGPOD_LIBS" >&6 + { echo "$as_me:$LINENO: result: $LIBGPOD_LIBS" >&5 +echo "${ECHO_T}$LIBGPOD_LIBS" >&6; } else LIBGPOD_CFLAGS="" LIBGPOD_LIBS="" @@ -37788,8 +40898,8 @@ have_libgpod=no fi - echo "$as_me:$LINENO: result: $have_libgpod" >&5 -echo "${ECHO_T}$have_libgpod" >&6 + { echo "$as_me:$LINENO: result: $have_libgpod" >&5 +echo "${ECHO_T}$have_libgpod" >&6; } if test "x$have_libgpod" != "xno"; then cat >>confdefs.h <<\_ACEOF @@ -37810,9 +40920,9 @@ for ac_func in itdb_track_set_thumbnails 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 @@ -37838,53 +40948,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -37893,13 +41009,15 @@ 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$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 @@ -37912,9 +41030,9 @@ for ac_func in itdb_get_mountpoint 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 @@ -37940,53 +41058,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -37995,13 +41119,15 @@ 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$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 @@ -38014,9 +41140,9 @@ for ac_func in itdb_device_get_ipod_info 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 @@ -38042,53 +41168,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -38097,13 +41229,15 @@ 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$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 @@ -38113,8 +41247,8 @@ done - echo "$as_me:$LINENO: checking for struct _Itdb_Track.movie_flag" >&5 -echo $ECHO_N "checking for struct _Itdb_Track.movie_flag... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for struct _Itdb_Track.movie_flag" >&5 +echo $ECHO_N "checking for struct _Itdb_Track.movie_flag... $ECHO_C" >&6; } if test "${ac_cv_member_struct__Itdb_Track_movie_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38137,24 +41271,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -38163,7 +41309,7 @@ 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 @@ -38182,24 +41328,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -38208,14 +41366,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct__Itdb_Track_movie_flag=no + ac_cv_member_struct__Itdb_Track_movie_flag=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__Itdb_Track_movie_flag" >&5 -echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_movie_flag" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__Itdb_Track_movie_flag" >&5 +echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_movie_flag" >&6; } if test $ac_cv_member_struct__Itdb_Track_movie_flag = yes; then cat >>confdefs.h <<\_ACEOF @@ -38225,8 +41385,8 @@ fi - echo "$as_me:$LINENO: checking for struct _Itdb_Track.skip_when_shuffling" >&5 -echo $ECHO_N "checking for struct _Itdb_Track.skip_when_shuffling... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for struct _Itdb_Track.skip_when_shuffling" >&5 +echo $ECHO_N "checking for struct _Itdb_Track.skip_when_shuffling... $ECHO_C" >&6; } if test "${ac_cv_member_struct__Itdb_Track_skip_when_shuffling+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38249,24 +41409,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -38275,7 +41447,7 @@ 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 @@ -38294,24 +41466,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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -38320,14 +41504,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct__Itdb_Track_skip_when_shuffling=no + ac_cv_member_struct__Itdb_Track_skip_when_shuffling=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__Itdb_Track_skip_when_shuffling" >&5 -echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_skip_when_shuffling" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__Itdb_Track_skip_when_shuffling" >&5 +echo "${ECHO_T}$ac_cv_member_struct__Itdb_Track_skip_when_shuffling" >&6; } if test $ac_cv_member_struct__Itdb_Track_skip_when_shuffling = yes; then cat >>confdefs.h <<\_ACEOF @@ -38369,9 +41555,9 @@ for ac_func in statvfs 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 @@ -38397,53 +41583,59 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -38452,13 +41644,15 @@ 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$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 @@ -38480,29 +41674,28 @@ # m4a/aac tag reading and writing needs libmp4v2 from faad2 or better mpeg4ip -# Check whether --with-mp4v2 or --without-mp4v2 was given. +# Check whether --with-mp4v2 was given. if test "${with_mp4v2+set}" = set; then - withval="$with_mp4v2" - have_mp4v2=$withval + withval=$with_mp4v2; have_mp4v2=$withval else have_mp4v2=no -fi; +fi + -# Check whether --with-mp4v2-dir or --without-mp4v2-dir was given. +# Check whether --with-mp4v2-dir was given. if test "${with_mp4v2_dir+set}" = set; then - withval="$with_mp4v2_dir" - mp4v2_dir="$withval" + withval=$with_mp4v2_dir; mp4v2_dir="$withval" else mp4v2_dir=/usr -fi; +fi + if test "$have_mp4v2" != "no"; 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' @@ -38526,18 +41719,19 @@ for ac_header in systems.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 @@ -38548,24 +41742,36 @@ #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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -38574,15 +41780,16 @@ 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 @@ -38591,8 +41798,13 @@ /* 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 @@ -38616,9 +41828,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 @@ -38642,25 +41855,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 @@ -38676,9 +41883,9 @@ for ac_header in mp4.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 @@ -38695,24 +41902,36 @@ #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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -38721,12 +41940,14 @@ 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 @@ -38737,8 +41958,8 @@ done - echo "$as_me:$LINENO: checking for MP4Read in -lmp4v2" >&5 -echo $ECHO_N "checking for MP4Read in -lmp4v2... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for MP4Read in -lmp4v2" >&5 +echo $ECHO_N "checking for MP4Read in -lmp4v2... $ECHO_C" >&6; } if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38751,40 +41972,52 @@ 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 MP4Read (); int main () { -MP4Read (); +return MP4Read (); ; 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_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s 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 @@ -38793,14 +42026,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mp4v2_MP4Read=no + ac_cv_lib_mp4v2_MP4Read=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core 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_mp4v2_MP4Read" >&5 -echo "${ECHO_T}$ac_cv_lib_mp4v2_MP4Read" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mp4v2_MP4Read" >&5 +echo "${ECHO_T}$ac_cv_lib_mp4v2_MP4Read" >&6; } if test $ac_cv_lib_mp4v2_MP4Read = yes; then have_mp4v2=yes else @@ -38858,8 +42092,7 @@ daapsave_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $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' @@ -38869,8 +42102,8 @@ -echo "$as_me:$LINENO: checking if KDE is at least 3.4 for DAAP support" >&5 -echo $ECHO_N "checking if KDE is at least 3.4 for DAAP support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if KDE is at least 3.4 for DAAP support" >&5 +echo $ECHO_N "checking if KDE is at least 3.4 for DAAP support... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF #include @@ -38880,24 +42113,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_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -38909,12 +42154,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have_kde34="no" + have_kde34="no" DNSSD_LIBS="" # echo "no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$daapsave_CXXFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -38933,8 +42179,8 @@ atleast_kde34_FALSE= fi -echo "$as_me:$LINENO: result: $have_kde34" >&5 -echo "${ECHO_T}$have_kde34" >&6 +{ echo "$as_me:$LINENO: result: $have_kde34" >&5 +echo "${ECHO_T}$have_kde34" >&6; } ############################################################################### # END DAAP KDE 3.4 CHECK @@ -38946,8 +42192,8 @@ # Extract the first word of "ruby", so it can be a program name with args. set dummy ruby; 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_RUBY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -38962,29 +42208,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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RUBY="$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_RUBY" && ac_cv_path_RUBY="no" ;; esac fi RUBY=$ac_cv_path_RUBY - if test -n "$RUBY"; then - echo "$as_me:$LINENO: result: $RUBY" >&5 -echo "${ECHO_T}$RUBY" >&6 + { echo "$as_me:$LINENO: result: $RUBY" >&5 +echo "${ECHO_T}$RUBY" >&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 + ruby_includes=`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'` ruby_ldflags=`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'` @@ -38998,18 +42245,19 @@ for ac_header in ruby.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 @@ -39020,24 +42268,36 @@ #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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_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); }; } && { ac_try='test -s conftest.$ac_objext' - { (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 @@ -39046,15 +42306,16 @@ 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 @@ -39063,8 +42324,13 @@ /* 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 @@ -39088,9 +42354,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 @@ -39114,25 +42381,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 @@ -39205,8 +42466,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 @@ -39217,8 +42478,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" @@ -39260,277 +42521,277 @@ po_SUBDIR_included_FALSE= fi - ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile" - ac_config_files="$ac_config_files amarok/Makefile" +ac_config_files="$ac_config_files amarok/Makefile" - ac_config_files="$ac_config_files amarok/src/Makefile" +ac_config_files="$ac_config_files amarok/src/Makefile" - ac_config_files="$ac_config_files amarok/src/amarokcore/Makefile" +ac_config_files="$ac_config_files amarok/src/amarokcore/Makefile" - ac_config_files="$ac_config_files amarok/src/analyzers/Makefile" +ac_config_files="$ac_config_files amarok/src/analyzers/Makefile" - ac_config_files="$ac_config_files amarok/src/collectionscanner/Makefile" +ac_config_files="$ac_config_files amarok/src/collectionscanner/Makefile" - ac_config_files="$ac_config_files amarok/src/data/Makefile" +ac_config_files="$ac_config_files amarok/src/data/Makefile" - ac_config_files="$ac_config_files amarok/src/device/Makefile" +ac_config_files="$ac_config_files amarok/src/device/Makefile" - ac_config_files="$ac_config_files amarok/src/device/massstorage/Makefile" +ac_config_files="$ac_config_files amarok/src/device/massstorage/Makefile" - ac_config_files="$ac_config_files amarok/src/device/nfs/Makefile" +ac_config_files="$ac_config_files amarok/src/device/nfs/Makefile" - ac_config_files="$ac_config_files amarok/src/device/smb/Makefile" +ac_config_files="$ac_config_files amarok/src/device/smb/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/akode/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/akode/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/helix/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/helix/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/helix/config/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/helix/config/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/helix/helix-sp/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/helix/helix-sp/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/kdemm/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/kdemm/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/mas/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/mas/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/nmm/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/nmm/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/nmm/icons/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/nmm/icons/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/void/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/void/Makefile" - ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile" +ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile" - ac_config_files="$ac_config_files amarok/src/images/Makefile" +ac_config_files="$ac_config_files amarok/src/images/Makefile" - ac_config_files="$ac_config_files amarok/src/images/icons/Makefile" +ac_config_files="$ac_config_files amarok/src/images/icons/Makefile" - ac_config_files="$ac_config_files amarok/src/konquisidebar/Makefile" +ac_config_files="$ac_config_files amarok/src/konquisidebar/Makefile" - ac_config_files="$ac_config_files amarok/src/loader/Makefile" +ac_config_files="$ac_config_files amarok/src/loader/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/daapreader/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/daapreader/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/daapreader/authentication/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/daapreader/authentication/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/http11/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/http11/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/fs/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/fs/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/generic/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/generic/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/ifp/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/ifp/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/ipod/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/ipod/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/mtp/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/mtp/Makefile" - ac_config_files="$ac_config_files amarok/src/mediadevice/njb/Makefile" +ac_config_files="$ac_config_files amarok/src/mediadevice/njb/Makefile" - ac_config_files="$ac_config_files amarok/src/metadata/Makefile" +ac_config_files="$ac_config_files amarok/src/metadata/Makefile" - ac_config_files="$ac_config_files amarok/src/metadata/aac/Makefile" +ac_config_files="$ac_config_files amarok/src/metadata/aac/Makefile" - ac_config_files="$ac_config_files amarok/src/metadata/audible/Makefile" +ac_config_files="$ac_config_files amarok/src/metadata/audible/Makefile" - ac_config_files="$ac_config_files amarok/src/metadata/m4a/Makefile" +ac_config_files="$ac_config_files amarok/src/metadata/m4a/Makefile" - ac_config_files="$ac_config_files amarok/src/metadata/mp4/Makefile" +ac_config_files="$ac_config_files amarok/src/metadata/mp4/Makefile" - ac_config_files="$ac_config_files amarok/src/metadata/rmff/Makefile" +ac_config_files="$ac_config_files amarok/src/metadata/rmff/Makefile" - ac_config_files="$ac_config_files amarok/src/metadata/wma/Makefile" +ac_config_files="$ac_config_files amarok/src/metadata/wma/Makefile" - ac_config_files="$ac_config_files amarok/src/plugin/Makefile" +ac_config_files="$ac_config_files amarok/src/plugin/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/common/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/common/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/graphequalizer/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/graphequalizer/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/lyrics_astraweb/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/lyrics_astraweb/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/lyrics_lyrc/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/lyrics_lyrc/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/playlist2html/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/playlist2html/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/ruby_debug/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/ruby_debug/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/score_default/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/score_default/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/score_impulsive/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/score_impulsive/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/templates/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/templates/Makefile" - ac_config_files="$ac_config_files amarok/src/scripts/webcontrol/Makefile" +ac_config_files="$ac_config_files amarok/src/scripts/webcontrol/Makefile" - ac_config_files="$ac_config_files amarok/src/sqlite/Makefile" +ac_config_files="$ac_config_files amarok/src/sqlite/Makefile" - ac_config_files="$ac_config_files amarok/src/statusbar/Makefile" +ac_config_files="$ac_config_files amarok/src/statusbar/Makefile" - ac_config_files="$ac_config_files amarok/src/themes/Makefile" +ac_config_files="$ac_config_files amarok/src/themes/Makefile" - ac_config_files="$ac_config_files amarok/src/themes/example/Makefile" +ac_config_files="$ac_config_files amarok/src/themes/example/Makefile" - ac_config_files="$ac_config_files amarok/src/themes/reinhardt/Makefile" +ac_config_files="$ac_config_files amarok/src/themes/reinhardt/Makefile" - ac_config_files="$ac_config_files amarok/src/themes/reinhardt/images/Makefile" +ac_config_files="$ac_config_files amarok/src/themes/reinhardt/images/Makefile" - ac_config_files="$ac_config_files amarok/src/vis/Makefile" +ac_config_files="$ac_config_files amarok/src/vis/Makefile" - ac_config_files="$ac_config_files amarok/src/vis/libvisual/Makefile" +ac_config_files="$ac_config_files amarok/src/vis/libvisual/Makefile" - ac_config_files="$ac_config_files amarok/src/vis/xmmswrapper/Makefile" +ac_config_files="$ac_config_files amarok/src/vis/xmmswrapper/Makefile" - ac_config_files="$ac_config_files doc/Makefile" +ac_config_files="$ac_config_files doc/Makefile" - ac_config_files="$ac_config_files doc/amarok/Makefile" +ac_config_files="$ac_config_files doc/amarok/Makefile" - ac_config_files="$ac_config_files doc/da/Makefile" +ac_config_files="$ac_config_files doc/da/Makefile" - ac_config_files="$ac_config_files doc/de/Makefile" +ac_config_files="$ac_config_files doc/de/Makefile" - ac_config_files="$ac_config_files doc/es/Makefile" +ac_config_files="$ac_config_files doc/es/Makefile" - ac_config_files="$ac_config_files doc/et/Makefile" +ac_config_files="$ac_config_files doc/et/Makefile" - ac_config_files="$ac_config_files doc/fr/Makefile" +ac_config_files="$ac_config_files doc/fr/Makefile" - ac_config_files="$ac_config_files doc/it/Makefile" +ac_config_files="$ac_config_files doc/it/Makefile" - ac_config_files="$ac_config_files doc/nl/Makefile" +ac_config_files="$ac_config_files doc/nl/Makefile" - ac_config_files="$ac_config_files doc/pl/Makefile" +ac_config_files="$ac_config_files doc/pl/Makefile" - ac_config_files="$ac_config_files doc/pt/Makefile" +ac_config_files="$ac_config_files doc/pt/Makefile" - ac_config_files="$ac_config_files doc/pt_BR/Makefile" +ac_config_files="$ac_config_files doc/pt_BR/Makefile" - ac_config_files="$ac_config_files doc/ru/Makefile" +ac_config_files="$ac_config_files doc/ru/Makefile" - ac_config_files="$ac_config_files doc/sv/Makefile" +ac_config_files="$ac_config_files doc/sv/Makefile" - ac_config_files="$ac_config_files po/Makefile" +ac_config_files="$ac_config_files po/Makefile" - ac_config_files="$ac_config_files po/af/Makefile" +ac_config_files="$ac_config_files po/af/Makefile" - ac_config_files="$ac_config_files po/ar/Makefile" +ac_config_files="$ac_config_files po/ar/Makefile" - ac_config_files="$ac_config_files po/az/Makefile" +ac_config_files="$ac_config_files po/az/Makefile" - ac_config_files="$ac_config_files po/bg/Makefile" +ac_config_files="$ac_config_files po/bg/Makefile" - ac_config_files="$ac_config_files po/br/Makefile" +ac_config_files="$ac_config_files po/br/Makefile" - ac_config_files="$ac_config_files po/ca/Makefile" +ac_config_files="$ac_config_files po/ca/Makefile" - ac_config_files="$ac_config_files po/cs/Makefile" +ac_config_files="$ac_config_files po/cs/Makefile" - ac_config_files="$ac_config_files po/cy/Makefile" +ac_config_files="$ac_config_files po/cy/Makefile" - ac_config_files="$ac_config_files po/da/Makefile" +ac_config_files="$ac_config_files po/da/Makefile" - ac_config_files="$ac_config_files po/de/Makefile" +ac_config_files="$ac_config_files po/de/Makefile" - ac_config_files="$ac_config_files po/el/Makefile" +ac_config_files="$ac_config_files po/el/Makefile" - ac_config_files="$ac_config_files po/en_GB/Makefile" +ac_config_files="$ac_config_files po/en_GB/Makefile" - ac_config_files="$ac_config_files po/es/Makefile" +ac_config_files="$ac_config_files po/es/Makefile" - ac_config_files="$ac_config_files po/et/Makefile" +ac_config_files="$ac_config_files po/et/Makefile" - ac_config_files="$ac_config_files po/fi/Makefile" +ac_config_files="$ac_config_files po/fi/Makefile" - ac_config_files="$ac_config_files po/fr/Makefile" +ac_config_files="$ac_config_files po/fr/Makefile" - ac_config_files="$ac_config_files po/ga/Makefile" +ac_config_files="$ac_config_files po/ga/Makefile" - ac_config_files="$ac_config_files po/gl/Makefile" +ac_config_files="$ac_config_files po/gl/Makefile" - ac_config_files="$ac_config_files po/he/Makefile" +ac_config_files="$ac_config_files po/he/Makefile" - ac_config_files="$ac_config_files po/hi/Makefile" +ac_config_files="$ac_config_files po/hi/Makefile" - ac_config_files="$ac_config_files po/hu/Makefile" +ac_config_files="$ac_config_files po/hu/Makefile" - ac_config_files="$ac_config_files po/is/Makefile" +ac_config_files="$ac_config_files po/is/Makefile" - ac_config_files="$ac_config_files po/it/Makefile" +ac_config_files="$ac_config_files po/it/Makefile" - ac_config_files="$ac_config_files po/ja/Makefile" +ac_config_files="$ac_config_files po/ja/Makefile" - ac_config_files="$ac_config_files po/ka/Makefile" +ac_config_files="$ac_config_files po/ka/Makefile" - ac_config_files="$ac_config_files po/km/Makefile" +ac_config_files="$ac_config_files po/km/Makefile" - ac_config_files="$ac_config_files po/ko/Makefile" +ac_config_files="$ac_config_files po/ko/Makefile" - ac_config_files="$ac_config_files po/lt/Makefile" +ac_config_files="$ac_config_files po/lt/Makefile" - ac_config_files="$ac_config_files po/ms/Makefile" +ac_config_files="$ac_config_files po/ms/Makefile" - ac_config_files="$ac_config_files po/nb/Makefile" +ac_config_files="$ac_config_files po/nb/Makefile" - ac_config_files="$ac_config_files po/nl/Makefile" +ac_config_files="$ac_config_files po/nl/Makefile" - ac_config_files="$ac_config_files po/nn/Makefile" +ac_config_files="$ac_config_files po/nn/Makefile" - ac_config_files="$ac_config_files po/pa/Makefile" +ac_config_files="$ac_config_files po/pa/Makefile" - ac_config_files="$ac_config_files po/pl/Makefile" +ac_config_files="$ac_config_files po/pl/Makefile" - ac_config_files="$ac_config_files po/pt/Makefile" +ac_config_files="$ac_config_files po/pt/Makefile" - ac_config_files="$ac_config_files po/pt_BR/Makefile" +ac_config_files="$ac_config_files po/pt_BR/Makefile" - ac_config_files="$ac_config_files po/ro/Makefile" +ac_config_files="$ac_config_files po/ro/Makefile" - ac_config_files="$ac_config_files po/ru/Makefile" +ac_config_files="$ac_config_files po/ru/Makefile" - ac_config_files="$ac_config_files po/rw/Makefile" +ac_config_files="$ac_config_files po/rw/Makefile" - ac_config_files="$ac_config_files po/sl/Makefile" +ac_config_files="$ac_config_files po/sl/Makefile" - ac_config_files="$ac_config_files po/sr/Makefile" +ac_config_files="$ac_config_files po/sr/Makefile" - ac_config_files="$ac_config_files po/sr@Latn/Makefile" +ac_config_files="$ac_config_files po/sr@Latn/Makefile" - ac_config_files="$ac_config_files po/sv/Makefile" +ac_config_files="$ac_config_files po/sv/Makefile" - ac_config_files="$ac_config_files po/ta/Makefile" +ac_config_files="$ac_config_files po/ta/Makefile" - ac_config_files="$ac_config_files po/tg/Makefile" +ac_config_files="$ac_config_files po/tg/Makefile" - ac_config_files="$ac_config_files po/th/Makefile" +ac_config_files="$ac_config_files po/th/Makefile" - ac_config_files="$ac_config_files po/tr/Makefile" +ac_config_files="$ac_config_files po/tr/Makefile" - ac_config_files="$ac_config_files po/uk/Makefile" +ac_config_files="$ac_config_files po/uk/Makefile" - ac_config_files="$ac_config_files po/uz/Makefile" +ac_config_files="$ac_config_files po/uz/Makefile" - ac_config_files="$ac_config_files po/zh_CN/Makefile" +ac_config_files="$ac_config_files po/zh_CN/Makefile" - ac_config_files="$ac_config_files po/zh_TW/Makefile" +ac_config_files="$ac_config_files po/zh_TW/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -39550,39 +42811,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 @@ -39591,38 +42871,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 @@ -39822,11 +43095,35 @@ # 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 +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh + +# 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 + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -39835,8 +43132,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='+ ' @@ -39850,18 +43182,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 @@ -39869,159 +43202,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'` + 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 - -# 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=: @@ -40030,7 +43324,19 @@ as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # 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'" @@ -40039,31 +43345,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.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -40071,30 +43360,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. @@ -40121,19 +43400,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.60, + 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 @@ -40144,39 +43425,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 @@ -40186,18 +43452,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 @@ -40213,172 +43485,184 @@ _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" ;; - "amarok/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/Makefile" ;; - "amarok/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/Makefile" ;; - "amarok/src/amarokcore/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/amarokcore/Makefile" ;; - "amarok/src/analyzers/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/analyzers/Makefile" ;; - "amarok/src/collectionscanner/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/collectionscanner/Makefile" ;; - "amarok/src/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/data/Makefile" ;; - "amarok/src/device/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/device/Makefile" ;; - "amarok/src/device/massstorage/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/device/massstorage/Makefile" ;; - "amarok/src/device/nfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/device/nfs/Makefile" ;; - "amarok/src/device/smb/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/device/smb/Makefile" ;; - "amarok/src/engine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/Makefile" ;; - "amarok/src/engine/akode/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/akode/Makefile" ;; - "amarok/src/engine/helix/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/helix/Makefile" ;; - "amarok/src/engine/helix/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/helix/config/Makefile" ;; - "amarok/src/engine/helix/helix-sp/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/helix/helix-sp/Makefile" ;; - "amarok/src/engine/kdemm/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/kdemm/Makefile" ;; - "amarok/src/engine/mas/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/mas/Makefile" ;; - "amarok/src/engine/nmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/Makefile" ;; - "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;; - "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;; - "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;; - "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;; - "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;; - "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;; - "amarok/src/loader/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/loader/Makefile" ;; - "amarok/src/mediadevice/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/Makefile" ;; - "amarok/src/mediadevice/daap/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/Makefile" ;; - "amarok/src/mediadevice/daap/daapreader/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/daapreader/Makefile" ;; - "amarok/src/mediadevice/daap/daapreader/authentication/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/daapreader/authentication/Makefile" ;; - "amarok/src/mediadevice/daap/mongrel/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/Makefile" ;; - "amarok/src/mediadevice/daap/mongrel/http11/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/http11/Makefile" ;; - "amarok/src/mediadevice/daap/mongrel/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/Makefile" ;; - "amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile" ;; - "amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile" ;; - "amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile" ;; - "amarok/src/mediadevice/fs/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/fs/Makefile" ;; - "amarok/src/mediadevice/generic/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/generic/Makefile" ;; - "amarok/src/mediadevice/ifp/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/ifp/Makefile" ;; - "amarok/src/mediadevice/ipod/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/ipod/Makefile" ;; - "amarok/src/mediadevice/mtp/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/mtp/Makefile" ;; - "amarok/src/mediadevice/njb/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/njb/Makefile" ;; - "amarok/src/metadata/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/Makefile" ;; - "amarok/src/metadata/aac/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/aac/Makefile" ;; - "amarok/src/metadata/audible/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/audible/Makefile" ;; - "amarok/src/metadata/m4a/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/m4a/Makefile" ;; - "amarok/src/metadata/mp4/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/mp4/Makefile" ;; - "amarok/src/metadata/rmff/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/rmff/Makefile" ;; - "amarok/src/metadata/wma/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/wma/Makefile" ;; - "amarok/src/plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/plugin/Makefile" ;; - "amarok/src/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/Makefile" ;; - "amarok/src/scripts/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/common/Makefile" ;; - "amarok/src/scripts/graphequalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/graphequalizer/Makefile" ;; - "amarok/src/scripts/lyrics_astraweb/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/lyrics_astraweb/Makefile" ;; - "amarok/src/scripts/lyrics_lyrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/lyrics_lyrc/Makefile" ;; - "amarok/src/scripts/playlist2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/playlist2html/Makefile" ;; - "amarok/src/scripts/ruby_debug/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/ruby_debug/Makefile" ;; - "amarok/src/scripts/score_default/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/score_default/Makefile" ;; - "amarok/src/scripts/score_impulsive/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/score_impulsive/Makefile" ;; - "amarok/src/scripts/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/templates/Makefile" ;; - "amarok/src/scripts/webcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/webcontrol/Makefile" ;; - "amarok/src/sqlite/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/sqlite/Makefile" ;; - "amarok/src/statusbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/statusbar/Makefile" ;; - "amarok/src/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/themes/Makefile" ;; - "amarok/src/themes/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/themes/example/Makefile" ;; - "amarok/src/themes/reinhardt/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/themes/reinhardt/Makefile" ;; - "amarok/src/themes/reinhardt/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/themes/reinhardt/images/Makefile" ;; - "amarok/src/vis/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/vis/Makefile" ;; - "amarok/src/vis/libvisual/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/vis/libvisual/Makefile" ;; - "amarok/src/vis/xmmswrapper/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/vis/xmmswrapper/Makefile" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/amarok/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/amarok/Makefile" ;; - "doc/da/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/da/Makefile" ;; - "doc/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/de/Makefile" ;; - "doc/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/es/Makefile" ;; - "doc/et/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/et/Makefile" ;; - "doc/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;; - "doc/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;; - "doc/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;; - "doc/pl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/pl/Makefile" ;; - "doc/pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/pt/Makefile" ;; - "doc/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/pt_BR/Makefile" ;; - "doc/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ru/Makefile" ;; - "doc/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;; - "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; - "po/af/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/af/Makefile" ;; - "po/ar/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;; - "po/az/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/az/Makefile" ;; - "po/bg/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/bg/Makefile" ;; - "po/br/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/br/Makefile" ;; - "po/ca/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;; - "po/cs/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/cs/Makefile" ;; - "po/cy/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/cy/Makefile" ;; - "po/da/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;; - "po/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;; - "po/el/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;; - "po/en_GB/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;; - "po/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;; - "po/et/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;; - "po/fi/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;; - "po/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;; - "po/ga/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ga/Makefile" ;; - "po/gl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;; - "po/he/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/he/Makefile" ;; - "po/hi/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/hi/Makefile" ;; - "po/hu/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;; - "po/is/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/is/Makefile" ;; - "po/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;; - "po/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;; - "po/ka/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ka/Makefile" ;; - "po/km/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/km/Makefile" ;; - "po/ko/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ko/Makefile" ;; - "po/lt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/lt/Makefile" ;; - "po/ms/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ms/Makefile" ;; - "po/nb/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nb/Makefile" ;; - "po/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nl/Makefile" ;; - "po/nn/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nn/Makefile" ;; - "po/pa/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;; - "po/pl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pl/Makefile" ;; - "po/pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;; - "po/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;; - "po/ro/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ro/Makefile" ;; - "po/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;; - "po/rw/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/rw/Makefile" ;; - "po/sl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sl/Makefile" ;; - "po/sr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;; - "po/sr@Latn/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr@Latn/Makefile" ;; - "po/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;; - "po/ta/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;; - "po/tg/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/tg/Makefile" ;; - "po/th/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/th/Makefile" ;; - "po/tr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;; - "po/uk/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/uk/Makefile" ;; - "po/uz/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/uz/Makefile" ;; - "po/zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/zh_CN/Makefile" ;; - "po/zh_TW/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/zh_TW/Makefile" ;; - "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" ;; + "amarok/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/Makefile" ;; + "amarok/src/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/Makefile" ;; + "amarok/src/amarokcore/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/amarokcore/Makefile" ;; + "amarok/src/analyzers/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/analyzers/Makefile" ;; + "amarok/src/collectionscanner/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/collectionscanner/Makefile" ;; + "amarok/src/data/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/data/Makefile" ;; + "amarok/src/device/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/device/Makefile" ;; + "amarok/src/device/massstorage/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/device/massstorage/Makefile" ;; + "amarok/src/device/nfs/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/device/nfs/Makefile" ;; + "amarok/src/device/smb/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/device/smb/Makefile" ;; + "amarok/src/engine/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/Makefile" ;; + "amarok/src/engine/akode/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/akode/Makefile" ;; + "amarok/src/engine/helix/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/helix/Makefile" ;; + "amarok/src/engine/helix/config/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/helix/config/Makefile" ;; + "amarok/src/engine/helix/helix-sp/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/helix/helix-sp/Makefile" ;; + "amarok/src/engine/kdemm/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/kdemm/Makefile" ;; + "amarok/src/engine/mas/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/mas/Makefile" ;; + "amarok/src/engine/nmm/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/Makefile" ;; + "amarok/src/engine/nmm/icons/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;; + "amarok/src/engine/void/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;; + "amarok/src/engine/xine/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;; + "amarok/src/images/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;; + "amarok/src/images/icons/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;; + "amarok/src/konquisidebar/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;; + "amarok/src/loader/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/loader/Makefile" ;; + "amarok/src/mediadevice/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/Makefile" ;; + "amarok/src/mediadevice/daap/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/Makefile" ;; + "amarok/src/mediadevice/daap/daapreader/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/daapreader/Makefile" ;; + "amarok/src/mediadevice/daap/daapreader/authentication/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/daapreader/authentication/Makefile" ;; + "amarok/src/mediadevice/daap/mongrel/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/Makefile" ;; + "amarok/src/mediadevice/daap/mongrel/http11/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/http11/Makefile" ;; + "amarok/src/mediadevice/daap/mongrel/lib/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/Makefile" ;; + "amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile" ;; + "amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile" ;; + "amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile" ;; + "amarok/src/mediadevice/fs/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/fs/Makefile" ;; + "amarok/src/mediadevice/generic/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/generic/Makefile" ;; + "amarok/src/mediadevice/ifp/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/ifp/Makefile" ;; + "amarok/src/mediadevice/ipod/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/ipod/Makefile" ;; + "amarok/src/mediadevice/mtp/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/mtp/Makefile" ;; + "amarok/src/mediadevice/njb/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/mediadevice/njb/Makefile" ;; + "amarok/src/metadata/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/Makefile" ;; + "amarok/src/metadata/aac/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/aac/Makefile" ;; + "amarok/src/metadata/audible/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/audible/Makefile" ;; + "amarok/src/metadata/m4a/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/m4a/Makefile" ;; + "amarok/src/metadata/mp4/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/mp4/Makefile" ;; + "amarok/src/metadata/rmff/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/rmff/Makefile" ;; + "amarok/src/metadata/wma/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/metadata/wma/Makefile" ;; + "amarok/src/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/plugin/Makefile" ;; + "amarok/src/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/Makefile" ;; + "amarok/src/scripts/common/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/common/Makefile" ;; + "amarok/src/scripts/graphequalizer/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/graphequalizer/Makefile" ;; + "amarok/src/scripts/lyrics_astraweb/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/lyrics_astraweb/Makefile" ;; + "amarok/src/scripts/lyrics_lyrc/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/lyrics_lyrc/Makefile" ;; + "amarok/src/scripts/playlist2html/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/playlist2html/Makefile" ;; + "amarok/src/scripts/ruby_debug/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/ruby_debug/Makefile" ;; + "amarok/src/scripts/score_default/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/score_default/Makefile" ;; + "amarok/src/scripts/score_impulsive/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/score_impulsive/Makefile" ;; + "amarok/src/scripts/templates/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/templates/Makefile" ;; + "amarok/src/scripts/webcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/scripts/webcontrol/Makefile" ;; + "amarok/src/sqlite/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/sqlite/Makefile" ;; + "amarok/src/statusbar/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/statusbar/Makefile" ;; + "amarok/src/themes/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/themes/Makefile" ;; + "amarok/src/themes/example/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/themes/example/Makefile" ;; + "amarok/src/themes/reinhardt/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/themes/reinhardt/Makefile" ;; + "amarok/src/themes/reinhardt/images/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/themes/reinhardt/images/Makefile" ;; + "amarok/src/vis/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/vis/Makefile" ;; + "amarok/src/vis/libvisual/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/vis/libvisual/Makefile" ;; + "amarok/src/vis/xmmswrapper/Makefile") CONFIG_FILES="$CONFIG_FILES amarok/src/vis/xmmswrapper/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/amarok/Makefile") CONFIG_FILES="$CONFIG_FILES doc/amarok/Makefile" ;; + "doc/da/Makefile") CONFIG_FILES="$CONFIG_FILES doc/da/Makefile" ;; + "doc/de/Makefile") CONFIG_FILES="$CONFIG_FILES doc/de/Makefile" ;; + "doc/es/Makefile") CONFIG_FILES="$CONFIG_FILES doc/es/Makefile" ;; + "doc/et/Makefile") CONFIG_FILES="$CONFIG_FILES doc/et/Makefile" ;; + "doc/fr/Makefile") CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;; + "doc/it/Makefile") CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;; + "doc/nl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;; + "doc/pl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pl/Makefile" ;; + "doc/pt/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt/Makefile" ;; + "doc/pt_BR/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_BR/Makefile" ;; + "doc/ru/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ru/Makefile" ;; + "doc/sv/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;; + "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; + "po/af/Makefile") CONFIG_FILES="$CONFIG_FILES po/af/Makefile" ;; + "po/ar/Makefile") CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;; + "po/az/Makefile") CONFIG_FILES="$CONFIG_FILES po/az/Makefile" ;; + "po/bg/Makefile") CONFIG_FILES="$CONFIG_FILES po/bg/Makefile" ;; + "po/br/Makefile") CONFIG_FILES="$CONFIG_FILES po/br/Makefile" ;; + "po/ca/Makefile") CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;; + "po/cs/Makefile") CONFIG_FILES="$CONFIG_FILES po/cs/Makefile" ;; + "po/cy/Makefile") CONFIG_FILES="$CONFIG_FILES po/cy/Makefile" ;; + "po/da/Makefile") CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;; + "po/de/Makefile") CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;; + "po/el/Makefile") CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;; + "po/en_GB/Makefile") CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;; + "po/es/Makefile") CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;; + "po/et/Makefile") CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;; + "po/fi/Makefile") CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;; + "po/fr/Makefile") CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;; + "po/ga/Makefile") CONFIG_FILES="$CONFIG_FILES po/ga/Makefile" ;; + "po/gl/Makefile") CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;; + "po/he/Makefile") CONFIG_FILES="$CONFIG_FILES po/he/Makefile" ;; + "po/hi/Makefile") CONFIG_FILES="$CONFIG_FILES po/hi/Makefile" ;; + "po/hu/Makefile") CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;; + "po/is/Makefile") CONFIG_FILES="$CONFIG_FILES po/is/Makefile" ;; + "po/it/Makefile") CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;; + "po/ja/Makefile") CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;; + "po/ka/Makefile") CONFIG_FILES="$CONFIG_FILES po/ka/Makefile" ;; + "po/km/Makefile") CONFIG_FILES="$CONFIG_FILES po/km/Makefile" ;; + "po/ko/Makefile") CONFIG_FILES="$CONFIG_FILES po/ko/Makefile" ;; + "po/lt/Makefile") CONFIG_FILES="$CONFIG_FILES po/lt/Makefile" ;; + "po/ms/Makefile") CONFIG_FILES="$CONFIG_FILES po/ms/Makefile" ;; + "po/nb/Makefile") CONFIG_FILES="$CONFIG_FILES po/nb/Makefile" ;; + "po/nl/Makefile") CONFIG_FILES="$CONFIG_FILES po/nl/Makefile" ;; + "po/nn/Makefile") CONFIG_FILES="$CONFIG_FILES po/nn/Makefile" ;; + "po/pa/Makefile") CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;; + "po/pl/Makefile") CONFIG_FILES="$CONFIG_FILES po/pl/Makefile" ;; + "po/pt/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;; + "po/pt_BR/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;; + "po/ro/Makefile") CONFIG_FILES="$CONFIG_FILES po/ro/Makefile" ;; + "po/ru/Makefile") CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;; + "po/rw/Makefile") CONFIG_FILES="$CONFIG_FILES po/rw/Makefile" ;; + "po/sl/Makefile") CONFIG_FILES="$CONFIG_FILES po/sl/Makefile" ;; + "po/sr/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;; + "po/sr@Latn/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr@Latn/Makefile" ;; + "po/sv/Makefile") CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;; + "po/ta/Makefile") CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;; + "po/tg/Makefile") CONFIG_FILES="$CONFIG_FILES po/tg/Makefile" ;; + "po/th/Makefile") CONFIG_FILES="$CONFIG_FILES po/th/Makefile" ;; + "po/tr/Makefile") CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;; + "po/uk/Makefile") CONFIG_FILES="$CONFIG_FILES po/uk/Makefile" ;; + "po/uz/Makefile") CONFIG_FILES="$CONFIG_FILES po/uz/Makefile" ;; + "po/zh_CN/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_CN/Makefile" ;; + "po/zh_TW/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_TW/Makefile" ;; + *) { { 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 @@ -40390,585 +43674,777 @@ 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,@LIB_ARTS@,$LIB_ARTS,;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,@PKGCONFIGFOUND@,$PKGCONFIGFOUND,;t t -s,@TAGLIB_CONFIG@,$TAGLIB_CONFIG,;t t -s,@taglib_includes@,$taglib_includes,;t t -s,@taglib_libs@,$taglib_libs,;t t -s,@XINE_CONFIG@,$XINE_CONFIG,;t t -s,@with_xine_TRUE@,$with_xine_TRUE,;t t -s,@with_xine_FALSE@,$with_xine_FALSE,;t t -s,@CFLAGS_XINE@,$CFLAGS_XINE,;t t -s,@LIBS_XINE@,$LIBS_XINE,;t t -s,@with_nmm_TRUE@,$with_nmm_TRUE,;t t -s,@with_nmm_FALSE@,$with_nmm_FALSE,;t t -s,@CFLAGS_NMM@,$CFLAGS_NMM,;t t -s,@LDFLAGS_NMM@,$LDFLAGS_NMM,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ALSALIB_CFLAGS@,$ALSALIB_CFLAGS,;t t -s,@ALSALIB_LIBS@,$ALSALIB_LIBS,;t t -s,@with_helix_TRUE@,$with_helix_TRUE,;t t -s,@with_helix_FALSE@,$with_helix_FALSE,;t t -s,@gl_libs@,$gl_libs,;t t -s,@SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t -s,@SQLITE_LIBS@,$SQLITE_LIBS,;t t -s,@LIB_SQLITE@,$LIB_SQLITE,;t t -s,@with_included_sqlite_TRUE@,$with_included_sqlite_TRUE,;t t -s,@with_included_sqlite_FALSE@,$with_included_sqlite_FALSE,;t t -s,@MYSQL_CONFIG@,$MYSQL_CONFIG,;t t -s,@enable_mysql_TRUE@,$enable_mysql_TRUE,;t t -s,@enable_mysql_FALSE@,$enable_mysql_FALSE,;t t -s,@mysql_includes@,$mysql_includes,;t t -s,@mysql_libs@,$mysql_libs,;t t -s,@POSTGRESQL_CONFIG@,$POSTGRESQL_CONFIG,;t t -s,@enable_postgresql_TRUE@,$enable_postgresql_TRUE,;t t -s,@enable_postgresql_FALSE@,$enable_postgresql_FALSE,;t t -s,@postgresql_includes@,$postgresql_includes,;t t -s,@postgresql_libs@,$postgresql_libs,;t t -s,@XMMS_CONFIG@,$XMMS_CONFIG,;t t -s,@xmms_cflags@,$xmms_cflags,;t t -s,@xmms_libs@,$xmms_libs,;t t -s,@GTK_CONFIG@,$GTK_CONFIG,;t t -s,@gtk_cflags@,$gtk_cflags,;t t -s,@gtk_libs@,$gtk_libs,;t t -s,@with_xmmswrapper_TRUE@,$with_xmmswrapper_TRUE,;t t -s,@with_xmmswrapper_FALSE@,$with_xmmswrapper_FALSE,;t t -s,@SDL_CONFIG@,$SDL_CONFIG,;t t -s,@sdl_cflags@,$sdl_cflags,;t t -s,@sdl_libs@,$sdl_libs,;t t -s,@LIBVISUAL_CFLAGS@,$LIBVISUAL_CFLAGS,;t t -s,@LIBVISUAL_LIBS@,$LIBVISUAL_LIBS,;t t -s,@with_libvisual_TRUE@,$with_libvisual_TRUE,;t t -s,@with_libvisual_FALSE@,$with_libvisual_FALSE,;t t -s,@LIB_TUNEPIMP@,$LIB_TUNEPIMP,;t t -s,@with_konqsidebar_TRUE@,$with_konqsidebar_TRUE,;t t -s,@with_konqsidebar_FALSE@,$with_konqsidebar_FALSE,;t t -s,@LIBNJB_CFLAGS@,$LIBNJB_CFLAGS,;t t -s,@LIBNJB_LIBS@,$LIBNJB_LIBS,;t t -s,@with_libnjb_TRUE@,$with_libnjb_TRUE,;t t -s,@with_libnjb_FALSE@,$with_libnjb_FALSE,;t t -s,@LIBMTP_CFLAGS@,$LIBMTP_CFLAGS,;t t -s,@LIBMTP_LIBS@,$LIBMTP_LIBS,;t t -s,@LIBMTP_FRIENDLY_NAME@,$LIBMTP_FRIENDLY_NAME,;t t -s,@with_libmtp_TRUE@,$with_libmtp_TRUE,;t t -s,@with_libmtp_FALSE@,$with_libmtp_FALSE,;t t -s,@IFP_INCLUDES@,$IFP_INCLUDES,;t t -s,@IFP_LIBS@,$IFP_LIBS,;t t -s,@with_ifp_TRUE@,$with_ifp_TRUE,;t t -s,@with_ifp_FALSE@,$with_ifp_FALSE,;t t -s,@LIBGPOD_CFLAGS@,$LIBGPOD_CFLAGS,;t t -s,@LIBGPOD_LIBS@,$LIBGPOD_LIBS,;t t -s,@with_libgpod_TRUE@,$with_libgpod_TRUE,;t t -s,@with_libgpod_FALSE@,$with_libgpod_FALSE,;t t -s,@MP4V2_INCLUDES@,$MP4V2_INCLUDES,;t t -s,@MP4V2_LIBS@,$MP4V2_LIBS,;t t -s,@with_mp4v2_TRUE@,$with_mp4v2_TRUE,;t t -s,@with_mp4v2_FALSE@,$with_mp4v2_FALSE,;t t -s,@DNSSD_LIBS@,$DNSSD_LIBS,;t t -s,@atleast_kde34_TRUE@,$atleast_kde34_TRUE,;t t -s,@atleast_kde34_FALSE@,$atleast_kde34_FALSE,;t t -s,@RUBY@,$RUBY,;t t -s,@ruby_includes@,$ruby_includes,;t t -s,@ruby_ldflags@,$ruby_ldflags,;t t -s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t -s,@amarok_SUBDIR_included_TRUE@,$amarok_SUBDIR_included_TRUE,;t t -s,@amarok_SUBDIR_included_FALSE@,$amarok_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,@po_SUBDIR_included_TRUE@,$po_SUBDIR_included_TRUE,;t t -s,@po_SUBDIR_included_FALSE@,$po_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 +LIB_ARTS!$LIB_ARTS$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 +PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim +TAGLIB_CONFIG!$TAGLIB_CONFIG$ac_delim +taglib_includes!$taglib_includes$ac_delim +taglib_libs!$taglib_libs$ac_delim +XINE_CONFIG!$XINE_CONFIG$ac_delim +with_xine_TRUE!$with_xine_TRUE$ac_delim +with_xine_FALSE!$with_xine_FALSE$ac_delim +CFLAGS_XINE!$CFLAGS_XINE$ac_delim +LIBS_XINE!$LIBS_XINE$ac_delim +with_nmm_TRUE!$with_nmm_TRUE$ac_delim +with_nmm_FALSE!$with_nmm_FALSE$ac_delim +CFLAGS_NMM!$CFLAGS_NMM$ac_delim +LDFLAGS_NMM!$LDFLAGS_NMM$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +ALSALIB_CFLAGS!$ALSALIB_CFLAGS$ac_delim +ALSALIB_LIBS!$ALSALIB_LIBS$ac_delim +with_helix_TRUE!$with_helix_TRUE$ac_delim +with_helix_FALSE!$with_helix_FALSE$ac_delim +gl_libs!$gl_libs$ac_delim +SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim +SQLITE_LIBS!$SQLITE_LIBS$ac_delim +LIB_SQLITE!$LIB_SQLITE$ac_delim +with_included_sqlite_TRUE!$with_included_sqlite_TRUE$ac_delim +with_included_sqlite_FALSE!$with_included_sqlite_FALSE$ac_delim +MYSQL_CONFIG!$MYSQL_CONFIG$ac_delim +enable_mysql_TRUE!$enable_mysql_TRUE$ac_delim +enable_mysql_FALSE!$enable_mysql_FALSE$ac_delim +mysql_includes!$mysql_includes$ac_delim +mysql_libs!$mysql_libs$ac_delim +POSTGRESQL_CONFIG!$POSTGRESQL_CONFIG$ac_delim +enable_postgresql_TRUE!$enable_postgresql_TRUE$ac_delim +enable_postgresql_FALSE!$enable_postgresql_FALSE$ac_delim +postgresql_includes!$postgresql_includes$ac_delim +postgresql_libs!$postgresql_libs$ac_delim +XMMS_CONFIG!$XMMS_CONFIG$ac_delim +xmms_cflags!$xmms_cflags$ac_delim +xmms_libs!$xmms_libs$ac_delim +GTK_CONFIG!$GTK_CONFIG$ac_delim +gtk_cflags!$gtk_cflags$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 +gtk_libs!$gtk_libs$ac_delim +with_xmmswrapper_TRUE!$with_xmmswrapper_TRUE$ac_delim +with_xmmswrapper_FALSE!$with_xmmswrapper_FALSE$ac_delim +SDL_CONFIG!$SDL_CONFIG$ac_delim +sdl_cflags!$sdl_cflags$ac_delim +sdl_libs!$sdl_libs$ac_delim +LIBVISUAL_CFLAGS!$LIBVISUAL_CFLAGS$ac_delim +LIBVISUAL_LIBS!$LIBVISUAL_LIBS$ac_delim +with_libvisual_TRUE!$with_libvisual_TRUE$ac_delim +with_libvisual_FALSE!$with_libvisual_FALSE$ac_delim +LIB_TUNEPIMP!$LIB_TUNEPIMP$ac_delim +with_konqsidebar_TRUE!$with_konqsidebar_TRUE$ac_delim +with_konqsidebar_FALSE!$with_konqsidebar_FALSE$ac_delim +LIBNJB_CFLAGS!$LIBNJB_CFLAGS$ac_delim +LIBNJB_LIBS!$LIBNJB_LIBS$ac_delim +with_libnjb_TRUE!$with_libnjb_TRUE$ac_delim +with_libnjb_FALSE!$with_libnjb_FALSE$ac_delim +LIBMTP_CFLAGS!$LIBMTP_CFLAGS$ac_delim +LIBMTP_LIBS!$LIBMTP_LIBS$ac_delim +LIBMTP_FRIENDLY_NAME!$LIBMTP_FRIENDLY_NAME$ac_delim +with_libmtp_TRUE!$with_libmtp_TRUE$ac_delim +with_libmtp_FALSE!$with_libmtp_FALSE$ac_delim +IFP_INCLUDES!$IFP_INCLUDES$ac_delim +IFP_LIBS!$IFP_LIBS$ac_delim +with_ifp_TRUE!$with_ifp_TRUE$ac_delim +with_ifp_FALSE!$with_ifp_FALSE$ac_delim +LIBGPOD_CFLAGS!$LIBGPOD_CFLAGS$ac_delim +LIBGPOD_LIBS!$LIBGPOD_LIBS$ac_delim +with_libgpod_TRUE!$with_libgpod_TRUE$ac_delim +with_libgpod_FALSE!$with_libgpod_FALSE$ac_delim +MP4V2_INCLUDES!$MP4V2_INCLUDES$ac_delim +MP4V2_LIBS!$MP4V2_LIBS$ac_delim +with_mp4v2_TRUE!$with_mp4v2_TRUE$ac_delim +with_mp4v2_FALSE!$with_mp4v2_FALSE$ac_delim +DNSSD_LIBS!$DNSSD_LIBS$ac_delim +atleast_kde34_TRUE!$atleast_kde34_TRUE$ac_delim +atleast_kde34_FALSE!$atleast_kde34_FALSE$ac_delim +RUBY!$RUBY$ac_delim +ruby_includes!$ruby_includes$ac_delim +ruby_ldflags!$ruby_ldflags$ac_delim +TOPSUBDIRS!$TOPSUBDIRS$ac_delim +amarok_SUBDIR_included_TRUE!$amarok_SUBDIR_included_TRUE$ac_delim +amarok_SUBDIR_included_FALSE!$amarok_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 +po_SUBDIR_included_TRUE!$po_SUBDIR_included_TRUE$ac_delim +po_SUBDIR_included_FALSE!$po_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` = 49; 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 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 @@ -40976,248 +44452,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" >$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 @@ -41228,135 +44586,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. @@ -41366,18 +44628,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 @@ -41399,53 +44672,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 --- amarok-1.4.3.orig/configure.in +++ amarok-1.4.3/configure.in @@ -40,7 +40,9 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(multimedia, "3.5.4") dnl searches for some needed programs +AM_INIT_AUTOMAKE(amarok-1.4.3, "3.5.4") dnl searches for some needed programs + +AM_MAINTAINER_MODE KDE_SET_PREFIX --- amarok-1.4.3.orig/amarok/src/vis/libvisual/Makefile.in +++ amarok-1.4.3/amarok/src/vis/libvisual/Makefile.in @@ -132,6 +132,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -224,6 +225,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -272,6 +276,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -279,12 +284,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -307,8 +309,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -322,6 +327,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -354,18 +360,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -432,7 +441,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*) \ @@ -441,9 +450,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -453,9 +462,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/libvisual/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -470,9 +479,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -737,9 +746,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/libvisual/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/libvisual/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/libvisual/Makefile.in --- amarok-1.4.3.orig/amarok/src/vis/Makefile.in +++ amarok-1.4.3/amarok/src/vis/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -409,7 +418,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*) \ @@ -418,9 +427,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/vis/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/vis/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -430,9 +439,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -447,9 +456,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -751,9 +760,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/Makefile.in --- amarok-1.4.3.orig/amarok/src/vis/xmmswrapper/Makefile.in +++ amarok-1.4.3/amarok/src/vis/xmmswrapper/Makefile.in @@ -132,6 +132,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -224,6 +225,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -272,6 +276,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -279,12 +284,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -307,8 +309,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -322,6 +327,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -354,18 +360,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -434,7 +443,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*) \ @@ -443,9 +452,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/xmmswrapper/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/xmmswrapper/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/vis/xmmswrapper/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/vis/xmmswrapper/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -455,9 +464,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/xmmswrapper/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/xmmswrapper/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/xmmswrapper/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/xmmswrapper/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/xmmswrapper/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -472,9 +481,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -739,9 +748,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/vis/xmmswrapper/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/vis/xmmswrapper/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/vis/xmmswrapper/Makefile + $(AUTOMAKE) --foreign amarok/src/vis/xmmswrapper/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/vis/xmmswrapper/Makefile.in --- amarok-1.4.3.orig/amarok/src/data/Makefile.in +++ amarok-1.4.3/amarok/src/data/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -411,7 +420,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*) \ @@ -420,9 +429,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/data/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/data/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/data/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/data/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -432,9 +441,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/data/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/data/Makefile + $(AUTOMAKE) --foreign amarok/src/data/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/data/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -449,9 +458,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -626,9 +635,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/data/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/data/Makefile + $(AUTOMAKE) --foreign amarok/src/data/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/data/Makefile.in --- amarok-1.4.3.orig/amarok/src/metadata/aac/Makefile.in +++ amarok-1.4.3/amarok/src/metadata/aac/Makefile.in @@ -146,6 +146,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -238,6 +239,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -286,6 +290,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -293,12 +298,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -321,8 +323,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -336,6 +341,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -368,18 +374,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -446,7 +455,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*) \ @@ -455,9 +464,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -467,9 +476,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/aac/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -484,9 +493,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -834,9 +843,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/aac/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/aac/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/aac/Makefile.in --- amarok-1.4.3.orig/amarok/src/metadata/m4a/Makefile.in +++ amarok-1.4.3/amarok/src/metadata/m4a/Makefile.in @@ -171,6 +171,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -263,6 +264,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @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 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ 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@ @@ -346,8 +348,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -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_x11_FALSE = @include_x11_FALSE@ @@ -393,18 +399,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -543,7 +552,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*) \ @@ -552,9 +561,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -564,9 +573,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/m4a/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -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 clean-noinstLTLIBRARIES: @@ -967,9 +976,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/m4a/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/m4a/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/m4a/Makefile.in --- amarok-1.4.3.orig/amarok/src/metadata/mp4/Makefile.in +++ amarok-1.4.3/amarok/src/metadata/mp4/Makefile.in @@ -151,6 +151,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -243,6 +244,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -291,6 +295,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -298,12 +303,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -326,8 +328,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -341,6 +346,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -373,18 +379,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -457,7 +466,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*) \ @@ -466,9 +475,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -478,9 +487,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/mp4/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -495,9 +504,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -848,9 +857,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/mp4/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/mp4/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/mp4/Makefile.in --- amarok-1.4.3.orig/amarok/src/metadata/wma/Makefile.in +++ amarok-1.4.3/amarok/src/metadata/wma/Makefile.in @@ -151,6 +151,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -243,6 +244,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -291,6 +295,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -298,12 +303,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -326,8 +328,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -341,6 +346,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -373,18 +379,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -459,7 +468,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*) \ @@ -468,9 +477,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wma/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wma/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/wma/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/wma/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -480,9 +489,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wma/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wma/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/wma/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/wma/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/wma/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -497,9 +506,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -851,9 +860,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/wma/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/wma/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/wma/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/wma/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/wma/Makefile.in --- amarok-1.4.3.orig/amarok/src/metadata/rmff/Makefile.in +++ amarok-1.4.3/amarok/src/metadata/rmff/Makefile.in @@ -151,6 +151,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -243,6 +244,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -291,6 +295,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -298,12 +303,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -326,8 +328,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -341,6 +346,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -373,18 +379,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -453,7 +462,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*) \ @@ -462,9 +471,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -474,9 +483,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/rmff/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -491,9 +500,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -843,9 +852,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/rmff/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/rmff/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/rmff/Makefile.in --- amarok-1.4.3.orig/amarok/src/metadata/Makefile.in +++ amarok-1.4.3/amarok/src/metadata/Makefile.in @@ -150,6 +150,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -242,6 +243,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -290,6 +294,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -297,12 +302,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -325,8 +327,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -340,6 +345,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -372,18 +378,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -461,7 +470,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*) \ @@ -470,9 +479,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -482,9 +491,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -499,9 +508,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -849,9 +858,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/Makefile.in --- amarok-1.4.3.orig/amarok/src/metadata/audible/Makefile.in +++ amarok-1.4.3/amarok/src/metadata/audible/Makefile.in @@ -151,6 +151,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -243,6 +244,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -291,6 +295,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -298,12 +303,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -326,8 +328,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -341,6 +346,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -373,18 +379,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -455,7 +464,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*) \ @@ -464,9 +473,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -476,9 +485,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/audible/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -493,9 +502,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -846,9 +855,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/metadata/audible/Makefile + $(AUTOMAKE) --foreign amarok/src/metadata/audible/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/metadata/audible/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/playlist2html/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/playlist2html/Makefile.in @@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -205,6 +206,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -253,6 +257,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -260,12 +265,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -288,8 +290,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -303,6 +308,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -335,18 +341,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -404,7 +413,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*) \ @@ -413,9 +422,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -425,9 +434,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/playlist2html/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -442,9 +451,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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-playlistexporterSCRIPTS: $(playlistexporter_SCRIPTS) @$(NORMAL_INSTALL) @@ -642,9 +651,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/playlist2html/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/playlist2html/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/playlist2html/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/graphequalizer/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/graphequalizer/Makefile.in @@ -158,6 +158,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -250,6 +251,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -298,6 +302,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -305,12 +310,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_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,8 +335,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -348,6 +353,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -380,18 +386,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -474,7 +483,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*) \ @@ -483,9 +492,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -495,9 +504,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/graphequalizer/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -512,9 +521,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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-graphequalizerPROGRAMS: $(graphequalizer_PROGRAMS) @$(NORMAL_INSTALL) @@ -833,9 +842,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/graphequalizer/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/graphequalizer/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/graphequalizer/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/lyrics_astraweb/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/lyrics_astraweb/Makefile.in @@ -110,6 +110,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -202,6 +203,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -250,6 +254,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -257,12 +262,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -285,8 +287,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -300,6 +305,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -332,18 +338,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -407,7 +416,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*) \ @@ -416,9 +425,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -428,9 +437,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_astraweb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -445,9 +454,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -622,9 +631,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_astraweb/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_astraweb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_astraweb/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/ruby_debug/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/ruby_debug/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -403,7 +412,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*) \ @@ -412,9 +421,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -424,9 +433,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/ruby_debug/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -441,9 +450,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -618,9 +627,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/ruby_debug/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/ruby_debug/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/ruby_debug/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/webcontrol/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/webcontrol/Makefile.in @@ -113,6 +113,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -205,6 +206,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -253,6 +257,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -260,12 +265,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -288,8 +290,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -303,6 +308,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -335,18 +341,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -428,7 +437,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*) \ @@ -437,9 +446,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -449,9 +458,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/webcontrol/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -466,9 +475,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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-webcontrolSCRIPTS: $(webcontrol_SCRIPTS) @$(NORMAL_INSTALL) @@ -664,9 +673,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/webcontrol/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/webcontrol/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/webcontrol/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/lyrics_lyrc/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/lyrics_lyrc/Makefile.in @@ -114,6 +114,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -206,6 +207,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -254,6 +258,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -261,12 +266,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -289,8 +291,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -304,6 +309,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -336,18 +342,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_lyrc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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-lyricslyrcSCRIPTS: $(lyricslyrc_SCRIPTS) @$(NORMAL_INSTALL) @@ -649,9 +658,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/lyrics_lyrc/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/lyrics_lyrc/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/lyrics_lyrc/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/common/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/common/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -399,7 +408,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*) \ @@ -408,9 +417,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -420,9 +429,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/common/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -437,9 +446,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -613,9 +622,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/common/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/common/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/common/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -414,7 +423,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*) \ @@ -423,9 +432,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -435,9 +444,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -452,9 +461,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -756,9 +765,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/score_impulsive/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/score_impulsive/Makefile.in @@ -114,6 +114,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -206,6 +207,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -254,6 +258,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -261,12 +266,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -289,8 +291,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -304,6 +309,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -336,18 +342,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_impulsive/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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-scoreimpulsiveSCRIPTS: $(scoreimpulsive_SCRIPTS) @$(NORMAL_INSTALL) @@ -650,9 +659,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_impulsive/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_impulsive/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_impulsive/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/score_default/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/score_default/Makefile.in @@ -114,6 +114,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -206,6 +207,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -254,6 +258,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -261,12 +266,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -289,8 +291,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -304,6 +309,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -336,18 +342,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -413,7 +422,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*) \ @@ -422,9 +431,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -434,9 +443,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_default/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -451,9 +460,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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-scoredefaultSCRIPTS: $(scoredefault_SCRIPTS) @$(NORMAL_INSTALL) @@ -649,9 +658,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/score_default/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/score_default/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/score_default/Makefile.in --- amarok-1.4.3.orig/amarok/src/scripts/templates/Makefile.in +++ amarok-1.4.3/amarok/src/scripts/templates/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -405,7 +414,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*) \ @@ -414,9 +423,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -426,9 +435,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/templates/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -443,9 +452,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -620,9 +629,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/scripts/templates/Makefile + $(AUTOMAKE) --foreign amarok/src/scripts/templates/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/scripts/templates/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/fs/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/fs/Makefile.in @@ -146,6 +146,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -238,6 +239,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -286,6 +290,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -293,12 +298,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -321,8 +323,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -336,6 +341,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -368,18 +374,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -462,7 +471,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*) \ @@ -471,9 +480,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/fs/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/fs/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/fs/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/fs/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -483,9 +492,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/fs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/fs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/fs/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/fs/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/fs/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -500,9 +509,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -820,9 +829,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/fs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/fs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/fs/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/fs/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/fs/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/ifp/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/ifp/Makefile.in @@ -143,6 +143,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -235,6 +236,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -283,6 +287,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -290,12 +295,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -318,8 +320,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -333,6 +338,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -365,18 +371,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -458,7 +467,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*) \ @@ -467,9 +476,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -479,9 +488,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ifp/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -496,9 +505,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -816,9 +825,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ifp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ifp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ifp/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/njb/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/njb/Makefile.in @@ -152,6 +152,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -244,6 +245,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -292,6 +296,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -299,12 +304,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -327,8 +329,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -342,6 +347,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -374,18 +380,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -463,7 +472,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*) \ @@ -472,9 +481,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -484,9 +493,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/njb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -501,9 +510,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -823,9 +832,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/njb/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/njb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/njb/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/mtp/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/mtp/Makefile.in @@ -151,6 +151,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -243,6 +244,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -291,6 +295,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -298,12 +303,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -326,8 +328,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -341,6 +346,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -373,18 +379,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -469,7 +478,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*) \ @@ -478,9 +487,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -490,9 +499,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/mtp/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -507,9 +516,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -827,9 +836,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/mtp/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/mtp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/mtp/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -429,7 +438,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*) \ @@ -438,9 +447,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -450,9 +459,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -467,9 +476,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -629,7 +638,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=command.rb user_interaction.rb doc_manager.rb format.rb cmd_manager.rb timer.rb Makefile.in specification.rb security.rb gem_commands.rb gem_openssl.rb builder.rb gem_runner.rb remote_installer.rb incremental_fetcher.rb old_format.rb config_file.rb source_index.rb open-uri.rb installer.rb dependency_list.rb validator.rb package.rb rubygems_version.rb version.rb loadpath_manager.rb custom_require.rb Makefile.am +KDE_DIST=command.rb user_interaction.rb format.rb doc_manager.rb cmd_manager.rb timer.rb Makefile.in specification.rb security.rb gem_commands.rb gem_openssl.rb builder.rb gem_runner.rb remote_installer.rb incremental_fetcher.rb old_format.rb config_file.rb source_index.rb open-uri.rb installer.rb dependency_list.rb validator.rb package.rb rubygems_version.rb version.rb loadpath_manager.rb custom_require.rb Makefile.am #>+ 2 docs-am: @@ -644,9 +653,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rubygems/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -410,7 +419,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*) \ @@ -419,9 +428,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -431,9 +440,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -448,9 +457,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -625,9 +634,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/mongrel/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -403,7 +412,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*) \ @@ -412,9 +421,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -424,9 +433,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -441,9 +450,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -618,9 +627,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/rbconfig/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/mongrel/lib/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/lib/Makefile.in @@ -125,6 +125,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -217,6 +218,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -265,6 +269,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -272,12 +277,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -300,8 +302,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -315,6 +320,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -347,18 +353,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -422,7 +431,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*) \ @@ -431,9 +440,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -443,9 +452,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -460,9 +469,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -786,9 +795,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/lib/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/lib/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/lib/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/mongrel/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -404,7 +413,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*) \ @@ -413,9 +422,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -425,9 +434,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -442,9 +451,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -746,9 +755,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/mongrel/http11/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/http11/Makefile.in @@ -141,6 +141,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -233,6 +234,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -281,6 +285,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -288,12 +293,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -316,8 +318,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -331,6 +336,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -363,18 +369,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -458,7 +467,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*) \ @@ -467,9 +476,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -479,9 +488,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/http11/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -496,9 +505,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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-amarokrubylibLTLIBRARIES: $(amarokrubylib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -791,9 +800,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/mongrel/http11/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/mongrel/http11/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/mongrel/http11/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/Makefile.in @@ -173,6 +173,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -265,6 +266,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @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 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ 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@ @@ -348,8 +350,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -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_x11_FALSE = @include_x11_FALSE@ @@ -395,18 +401,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -509,7 +518,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*) \ @@ -518,9 +527,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -530,9 +539,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -547,9 +556,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -1032,9 +1041,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/daapreader/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/daapreader/Makefile.in @@ -149,6 +149,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -241,6 +242,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -289,6 +293,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -296,12 +301,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -324,8 +326,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -339,6 +344,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -371,18 +377,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -454,7 +463,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*) \ @@ -463,9 +472,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -475,9 +484,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -492,9 +501,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -853,9 +862,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in @@ -145,6 +145,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -237,6 +238,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -285,6 +289,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -292,12 +297,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -320,8 +322,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -335,6 +340,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -367,18 +373,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -452,7 +461,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*) \ @@ -461,9 +470,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -473,9 +482,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -490,9 +499,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -770,9 +779,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/daap/daapreader/authentication/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/daap/daapreader/authentication/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/daap/daapreader/authentication/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/ipod/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/ipod/Makefile.in @@ -146,6 +146,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -238,6 +239,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -286,6 +290,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -293,12 +298,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -321,8 +323,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -336,6 +341,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -368,18 +374,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -464,7 +473,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*) \ @@ -473,9 +482,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -485,9 +494,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ipod/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -502,9 +511,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -822,9 +831,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/ipod/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/ipod/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/ipod/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/generic/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/generic/Makefile.in @@ -149,6 +149,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -241,6 +242,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -289,6 +293,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -296,12 +301,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -324,8 +326,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -339,6 +344,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -371,18 +377,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -471,7 +480,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*) \ @@ -480,9 +489,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -492,9 +501,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/generic/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -509,9 +518,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -834,9 +843,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/generic/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/generic/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/generic/Makefile.in --- amarok-1.4.3.orig/amarok/src/mediadevice/Makefile.in +++ amarok-1.4.3/amarok/src/mediadevice/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -409,7 +418,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*) \ @@ -418,9 +427,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -430,9 +439,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -447,9 +456,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -751,9 +760,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/mediadevice/Makefile + $(AUTOMAKE) --foreign amarok/src/mediadevice/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/mediadevice/Makefile.in --- amarok-1.4.3.orig/amarok/src/device/nfs/Makefile.in +++ amarok-1.4.3/amarok/src/device/nfs/Makefile.in @@ -146,6 +146,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -238,6 +239,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -286,6 +290,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -293,12 +298,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -321,8 +323,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -336,6 +341,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -368,18 +374,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -457,7 +466,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*) \ @@ -466,9 +475,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -478,9 +487,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile + $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/nfs/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -495,9 +504,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -804,9 +813,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/nfs/Makefile + $(AUTOMAKE) --foreign amarok/src/device/nfs/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/nfs/Makefile.in --- amarok-1.4.3.orig/amarok/src/device/smb/Makefile.in +++ amarok-1.4.3/amarok/src/device/smb/Makefile.in @@ -146,6 +146,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -238,6 +239,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -286,6 +290,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -293,12 +298,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -321,8 +323,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -336,6 +341,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -368,18 +374,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -457,7 +466,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*) \ @@ -466,9 +475,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -478,9 +487,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile + $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/smb/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -495,9 +504,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -804,9 +813,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/smb/Makefile + $(AUTOMAKE) --foreign amarok/src/device/smb/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/smb/Makefile.in --- amarok-1.4.3.orig/amarok/src/device/Makefile.in +++ amarok-1.4.3/amarok/src/device/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -405,7 +414,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*) \ @@ -414,9 +423,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -426,9 +435,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/Makefile + $(AUTOMAKE) --foreign amarok/src/device/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -443,9 +452,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -747,9 +756,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/Makefile + $(AUTOMAKE) --foreign amarok/src/device/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/Makefile.in --- amarok-1.4.3.orig/amarok/src/device/massstorage/Makefile.in +++ amarok-1.4.3/amarok/src/device/massstorage/Makefile.in @@ -147,6 +147,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -239,6 +240,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -287,6 +291,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -294,12 +299,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -322,8 +324,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -337,6 +342,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -369,18 +375,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -462,7 +471,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*) \ @@ -471,9 +480,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -483,9 +492,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile + $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/massstorage/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -500,9 +509,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -809,9 +818,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/device/massstorage/Makefile + $(AUTOMAKE) --foreign amarok/src/device/massstorage/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/device/massstorage/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/mas/Makefile.in +++ amarok-1.4.3/amarok/src/engine/mas/Makefile.in @@ -147,6 +147,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -239,6 +240,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -287,6 +291,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -294,12 +299,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -322,8 +324,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -337,6 +342,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -369,18 +375,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -466,7 +475,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*) \ @@ -475,9 +484,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -487,9 +496,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/mas/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -504,9 +513,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -824,9 +833,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/mas/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/mas/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/mas/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/nmm/icons/Makefile.in +++ amarok-1.4.3/amarok/src/engine/nmm/icons/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/icons/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -599,9 +608,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/icons/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/nmm/Makefile.in +++ amarok-1.4.3/amarok/src/engine/nmm/Makefile.in @@ -170,6 +170,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -262,6 +263,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @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 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ 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@ @@ -345,8 +347,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -360,6 +365,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -392,18 +398,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -514,7 +523,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*) \ @@ -523,9 +532,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -535,9 +544,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -552,9 +561,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -1049,9 +1058,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/nmm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/nmm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/nmm/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/void/Makefile.in +++ amarok-1.4.3/amarok/src/engine/void/Makefile.in @@ -146,6 +146,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -238,6 +239,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -286,6 +290,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -293,12 +298,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -321,8 +323,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -336,6 +341,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -368,18 +374,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -461,7 +470,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*) \ @@ -470,9 +479,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -482,9 +491,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/void/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -499,9 +508,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -808,9 +817,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/void/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/void/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/void/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/xine/Makefile.in +++ amarok-1.4.3/amarok/src/engine/xine/Makefile.in @@ -160,6 +160,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -252,6 +253,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @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 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ 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@ @@ -335,8 +337,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -350,6 +355,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -382,18 +388,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -486,7 +495,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*) \ @@ -495,9 +504,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -507,9 +516,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/xine/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -524,9 +533,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -902,9 +911,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/xine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/xine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/xine/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/akode/Makefile.in +++ amarok-1.4.3/amarok/src/engine/akode/Makefile.in @@ -147,6 +147,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -239,6 +240,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -287,6 +291,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -294,12 +299,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -322,8 +324,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -337,6 +342,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -369,18 +375,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -448,7 +457,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*) \ @@ -457,9 +466,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -469,9 +478,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/akode/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -486,9 +495,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -796,9 +805,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/akode/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/akode/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/akode/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/helix/config/Makefile.in +++ amarok-1.4.3/amarok/src/engine/helix/config/Makefile.in @@ -142,6 +142,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -234,6 +235,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -282,6 +286,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -289,12 +294,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -317,8 +319,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -332,6 +337,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -364,18 +370,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -448,7 +457,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*) \ @@ -457,9 +466,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -469,9 +478,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/config/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -486,9 +495,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -758,9 +767,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/config/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/config/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/config/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/helix/Makefile.in +++ amarok-1.4.3/amarok/src/engine/helix/Makefile.in @@ -164,6 +164,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -256,6 +257,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @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 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ 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@ @@ -339,8 +341,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -354,6 +359,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -386,18 +392,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -496,7 +505,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*) \ @@ -505,9 +514,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -517,9 +526,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -534,9 +543,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -969,9 +978,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/helix/helix-sp/Makefile.in +++ amarok-1.4.3/amarok/src/engine/helix/helix-sp/Makefile.in @@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -225,6 +226,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -273,6 +277,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -280,12 +285,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -308,8 +310,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -323,6 +328,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -355,18 +361,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -459,7 +468,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*) \ @@ -468,9 +477,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -480,9 +489,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/helix-sp/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -497,9 +506,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -752,9 +761,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/helix/helix-sp/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/helix/helix-sp/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/helix/helix-sp/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/kdemm/Makefile.in +++ amarok-1.4.3/amarok/src/engine/kdemm/Makefile.in @@ -147,6 +147,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -239,6 +240,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -287,6 +291,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -294,12 +299,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -322,8 +324,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -337,6 +342,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -369,18 +375,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -466,7 +475,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*) \ @@ -475,9 +484,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -487,9 +496,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/kdemm/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -504,9 +513,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -824,9 +833,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/kdemm/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/kdemm/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/kdemm/Makefile.in --- amarok-1.4.3.orig/amarok/src/engine/Makefile.in +++ amarok-1.4.3/amarok/src/engine/Makefile.in @@ -119,6 +119,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -211,6 +212,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -259,6 +263,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -266,12 +271,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -294,8 +296,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -309,6 +314,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -341,18 +347,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -416,7 +425,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*) \ @@ -425,9 +434,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/engine/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/engine/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -437,9 +446,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -454,9 +463,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -758,9 +767,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/engine/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/engine/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/engine/Makefile + $(AUTOMAKE) --foreign amarok/src/engine/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/engine/Makefile.in --- amarok-1.4.3.orig/amarok/src/Makefile.in +++ amarok-1.4.3/amarok/src/Makefile.in @@ -105,9 +105,8 @@ tagguesser.lo threadweaver.lo tooltip.lo trackpickerdialog.lo \ tracktooltip.lo transferdialog.lo xmlloader.lo xspfplaylist.lo #>- libamarok_la_OBJECTS = $(am_libamarok_la_OBJECTS) -#>+ 26 -libamarok_la_final_OBJECTS = libamarok_la.all_cpp.lo -libamarok_la_nofinal_OBJECTS = actionclasses.lo app.lo atomicstring.lo \ +#>+ 23 +libamarok_la_OBJECTS = actionclasses.lo app.lo atomicstring.lo \ atomicurl.lo browserbar.lo clicklineedit.lo \ collectionbrowser.lo collectiondb.lo columnlist.lo \ configdialog.lo contextbrowser.lo coverfetcher.lo \ @@ -130,8 +129,6 @@ socketserver.lo statistics.lo systray.lo tagdialog.lo \ tagguesser.lo threadweaver.lo tooltip.lo trackpickerdialog.lo \ tracktooltip.lo transferdialog.lo xmlloader.lo xspfplaylist.lo Options1.lo Options2.lo Options4.lo Options5.lo Options7.lo Options8.lo dbsetup.lo deletedialogbase.lo firstrunwizard.lo newdynamic.lo organizecollectiondialog.lo podcastsettingsbase.lo scriptmanagerbase.lo tagdialogbase.lo tagguesserconfigdialog.lo trackpickerdialogbase.lo -@KDE_USE_FINAL_FALSE@libamarok_la_OBJECTS = $(libamarok_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libamarok_la_OBJECTS = $(libamarok_la_final_OBJECTS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_amarokapp_OBJECTS = main.$(OBJEXT) @@ -263,6 +260,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -355,6 +353,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -403,6 +404,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -410,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@ @@ -438,8 +437,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -453,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_x11_FALSE = @include_x11_FALSE@ @@ -485,18 +488,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -550,6 +556,7 @@ @with_included_sqlite_TRUE@LIB_SQLITE_LOCAL = $(top_builddir)/amarok/src/sqlite/libsqlite.la @with_included_sqlite_TRUE@sqlite_includes = -I$(top_srcdir)/amarok/src/sqlite @with_konqsidebar_TRUE@KONQSIDEBAR_SUBDIR = konquisidebar +KDE_OPTIONS = nofinal lib_LTLIBRARIES = libamarok.la SUBDIRS = \ amarokcore \ @@ -870,7 +877,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*) \ @@ -879,9 +886,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -891,9 +898,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/Makefile + $(AUTOMAKE) --foreign amarok/src/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -908,9 +915,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -1442,7 +1449,7 @@ #>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ #>- clean-libtool mostlyclean-am #>+ 2 -clean-am: clean-metasources clean-ui clean-bcheck clean-final clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ +clean-am: clean-metasources clean-ui clean-bcheck clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool mostlyclean-am distclean: distclean-recursive @@ -1570,18 +1577,18 @@ mocs: mediadevicemanager.moc #>+ 3 -playlistbrowser.moc: $(srcdir)/playlistbrowser.h - $(MOC) $(srcdir)/playlistbrowser.h -o playlistbrowser.moc +browserbar.moc: $(srcdir)/browserbar.h + $(MOC) $(srcdir)/browserbar.h -o browserbar.moc #>+ 2 -mocs: playlistbrowser.moc +mocs: browserbar.moc #>+ 3 -browserbar.moc: $(srcdir)/browserbar.h - $(MOC) $(srcdir)/browserbar.h -o browserbar.moc +playlistbrowser.moc: $(srcdir)/playlistbrowser.h + $(MOC) $(srcdir)/playlistbrowser.h -o playlistbrowser.moc #>+ 2 -mocs: browserbar.moc +mocs: playlistbrowser.moc #>+ 3 statistics.moc: $(srcdir)/statistics.h @@ -1605,13 +1612,6 @@ mocs: ktrm.moc #>+ 3 -directorylist.moc: $(srcdir)/directorylist.h - $(MOC) $(srcdir)/directorylist.h -o directorylist.moc - -#>+ 2 -mocs: directorylist.moc - -#>+ 3 hintlineedit.moc: $(srcdir)/hintlineedit.h $(MOC) $(srcdir)/hintlineedit.h -o hintlineedit.moc @@ -1619,11 +1619,11 @@ mocs: hintlineedit.moc #>+ 3 -moodbar.moc: $(srcdir)/moodbar.h - $(MOC) $(srcdir)/moodbar.h -o moodbar.moc +directorylist.moc: $(srcdir)/directorylist.h + $(MOC) $(srcdir)/directorylist.h -o directorylist.moc #>+ 2 -mocs: moodbar.moc +mocs: directorylist.moc #>+ 3 mediabrowser.moc: $(srcdir)/mediabrowser.h @@ -1633,6 +1633,13 @@ mocs: mediabrowser.moc #>+ 3 +moodbar.moc: $(srcdir)/moodbar.h + $(MOC) $(srcdir)/moodbar.h -o moodbar.moc + +#>+ 2 +mocs: moodbar.moc + +#>+ 3 mediumpluginmanager.moc: $(srcdir)/mediumpluginmanager.h $(MOC) $(srcdir)/mediumpluginmanager.h -o mediumpluginmanager.moc @@ -1668,6 +1675,13 @@ mocs: xmlloader.moc #>+ 3 +devicemanager.moc: $(srcdir)/devicemanager.h + $(MOC) $(srcdir)/devicemanager.h -o devicemanager.moc + +#>+ 2 +mocs: devicemanager.moc + +#>+ 3 collectionbrowser.moc: $(srcdir)/collectionbrowser.h $(MOC) $(srcdir)/collectionbrowser.h -o collectionbrowser.moc @@ -1675,11 +1689,11 @@ mocs: collectionbrowser.moc #>+ 3 -devicemanager.moc: $(srcdir)/devicemanager.h - $(MOC) $(srcdir)/devicemanager.h -o devicemanager.moc +refreshimages.moc: $(srcdir)/refreshimages.h + $(MOC) $(srcdir)/refreshimages.h -o refreshimages.moc #>+ 2 -mocs: devicemanager.moc +mocs: refreshimages.moc #>+ 3 app.moc: $(srcdir)/app.h @@ -1689,18 +1703,18 @@ mocs: app.moc #>+ 3 -refreshimages.moc: $(srcdir)/refreshimages.h - $(MOC) $(srcdir)/refreshimages.h -o refreshimages.moc +playlistbrowseritem.moc: $(srcdir)/playlistbrowseritem.h + $(MOC) $(srcdir)/playlistbrowseritem.h -o playlistbrowseritem.moc #>+ 2 -mocs: refreshimages.moc +mocs: playlistbrowseritem.moc #>+ 3 -playlistbrowseritem.moc: $(srcdir)/playlistbrowseritem.h - $(MOC) $(srcdir)/playlistbrowseritem.h -o playlistbrowseritem.moc +htmlview.moc: $(srcdir)/htmlview.h + $(MOC) $(srcdir)/htmlview.h -o htmlview.moc #>+ 2 -mocs: playlistbrowseritem.moc +mocs: htmlview.moc #>+ 3 smartplaylisteditor.moc: $(srcdir)/smartplaylisteditor.h @@ -1710,11 +1724,11 @@ mocs: smartplaylisteditor.moc #>+ 3 -htmlview.moc: $(srcdir)/htmlview.h - $(MOC) $(srcdir)/htmlview.h -o htmlview.moc +podcastsettings.moc: $(srcdir)/podcastsettings.h + $(MOC) $(srcdir)/podcastsettings.h -o podcastsettings.moc #>+ 2 -mocs: htmlview.moc +mocs: podcastsettings.moc #>+ 3 mydiroperator.moc: $(srcdir)/mydiroperator.h @@ -1724,18 +1738,18 @@ mocs: mydiroperator.moc #>+ 3 -podcastsettings.moc: $(srcdir)/podcastsettings.h - $(MOC) $(srcdir)/podcastsettings.h -o podcastsettings.moc +columnlist.moc: $(srcdir)/columnlist.h + $(MOC) $(srcdir)/columnlist.h -o columnlist.moc #>+ 2 -mocs: podcastsettings.moc +mocs: columnlist.moc #>+ 3 -mountpointmanager.moc: $(srcdir)/mountpointmanager.h - $(MOC) $(srcdir)/mountpointmanager.h -o mountpointmanager.moc +filebrowser.moc: $(srcdir)/filebrowser.h + $(MOC) $(srcdir)/filebrowser.h -o filebrowser.moc #>+ 2 -mocs: mountpointmanager.moc +mocs: filebrowser.moc #>+ 3 actionclasses.moc: $(srcdir)/actionclasses.h @@ -1745,18 +1759,11 @@ mocs: actionclasses.moc #>+ 3 -columnlist.moc: $(srcdir)/columnlist.h - $(MOC) $(srcdir)/columnlist.h -o columnlist.moc - -#>+ 2 -mocs: columnlist.moc - -#>+ 3 -filebrowser.moc: $(srcdir)/filebrowser.h - $(MOC) $(srcdir)/filebrowser.h -o filebrowser.moc +mountpointmanager.moc: $(srcdir)/mountpointmanager.h + $(MOC) $(srcdir)/mountpointmanager.h -o mountpointmanager.moc #>+ 2 -mocs: filebrowser.moc +mocs: mountpointmanager.moc #>+ 3 scrobbler.moc: $(srcdir)/scrobbler.h @@ -1878,18 +1885,18 @@ mocs: equalizerpresetmanager.moc #>+ 3 -deviceconfiguredialog.moc: $(srcdir)/deviceconfiguredialog.h - $(MOC) $(srcdir)/deviceconfiguredialog.h -o deviceconfiguredialog.moc +collectiondb.moc: $(srcdir)/collectiondb.h + $(MOC) $(srcdir)/collectiondb.h -o collectiondb.moc #>+ 2 -mocs: deviceconfiguredialog.moc +mocs: collectiondb.moc #>+ 3 -collectiondb.moc: $(srcdir)/collectiondb.h - $(MOC) $(srcdir)/collectiondb.h -o collectiondb.moc +deviceconfiguredialog.moc: $(srcdir)/deviceconfiguredialog.h + $(MOC) $(srcdir)/deviceconfiguredialog.h -o deviceconfiguredialog.moc #>+ 2 -mocs: collectiondb.moc +mocs: deviceconfiguredialog.moc #>+ 3 xmlloader_p.moc: $(srcdir)/xmlloader_p.h @@ -1913,18 +1920,18 @@ mocs: multitabbar.moc #>+ 3 -playlist.moc: $(srcdir)/playlist.h - $(MOC) $(srcdir)/playlist.h -o playlist.moc +covermanager.moc: $(srcdir)/covermanager.h + $(MOC) $(srcdir)/covermanager.h -o covermanager.moc #>+ 2 -mocs: playlist.moc +mocs: covermanager.moc #>+ 3 -covermanager.moc: $(srcdir)/covermanager.h - $(MOC) $(srcdir)/covermanager.h -o covermanager.moc +playlist.moc: $(srcdir)/playlist.h + $(MOC) $(srcdir)/playlist.h -o playlist.moc #>+ 2 -mocs: covermanager.moc +mocs: playlist.moc #>+ 3 multitabbar_p.moc: $(srcdir)/multitabbar_p.h @@ -1948,18 +1955,18 @@ mocs: trackpickerdialog.moc #>+ 3 -playerwindow.moc: $(srcdir)/playerwindow.h - $(MOC) $(srcdir)/playerwindow.h -o playerwindow.moc +lastfm.moc: $(srcdir)/lastfm.h + $(MOC) $(srcdir)/lastfm.h -o lastfm.moc #>+ 2 -mocs: playerwindow.moc +mocs: lastfm.moc #>+ 3 -lastfm.moc: $(srcdir)/lastfm.h - $(MOC) $(srcdir)/lastfm.h -o lastfm.moc +playerwindow.moc: $(srcdir)/playerwindow.h + $(MOC) $(srcdir)/playerwindow.h -o playerwindow.moc #>+ 2 -mocs: lastfm.moc +mocs: playerwindow.moc #>+ 3 enginebase.moc: $(srcdir)/enginebase.h @@ -1983,25 +1990,25 @@ mocs: pixmapviewer.moc #>+ 3 -sliderwidget.moc: $(srcdir)/sliderwidget.h - $(MOC) $(srcdir)/sliderwidget.h -o sliderwidget.moc +cuefile.moc: $(srcdir)/cuefile.h + $(MOC) $(srcdir)/cuefile.h -o cuefile.moc #>+ 2 -mocs: sliderwidget.moc +mocs: cuefile.moc #>+ 3 -cuefile.moc: $(srcdir)/cuefile.h - $(MOC) $(srcdir)/cuefile.h -o cuefile.moc +sliderwidget.moc: $(srcdir)/sliderwidget.h + $(MOC) $(srcdir)/sliderwidget.h -o sliderwidget.moc #>+ 2 -mocs: cuefile.moc +mocs: sliderwidget.moc #>+ 3 clean-metasources: - -rm -f mediadevicemanager.moc playlistbrowser.moc browserbar.moc statistics.moc deletedialog.moc ktrm.moc directorylist.moc hintlineedit.moc moodbar.moc mediabrowser.moc mediumpluginmanager.moc tagdialog.moc enginecontroller.moc contextbrowser.moc xmlloader.moc collectionbrowser.moc devicemanager.moc app.moc refreshimages.moc playlistbrowseritem.moc smartplaylisteditor.moc htmlview.moc mydiroperator.moc podcastsettings.moc mountpointmanager.moc actionclasses.moc columnlist.moc filebrowser.moc scrobbler.moc prettypopupmenu.moc osd.moc scriptmanager.moc configdialog.moc transferdialog.moc equalizersetup.moc playlistwindow.moc metabundlesaver.moc tooltip.moc tracktooltip.moc clicklineedit.moc socketserver.moc playlistselection.moc playlistloader.moc scancontroller.moc equalizerpresetmanager.moc deviceconfiguredialog.moc collectiondb.moc xmlloader_p.moc queuemanager.moc multitabbar.moc playlist.moc covermanager.moc multitabbar_p.moc threadweaver.moc trackpickerdialog.moc playerwindow.moc lastfm.moc enginebase.moc coverfetcher.moc pixmapviewer.moc sliderwidget.moc cuefile.moc + -rm -f mediadevicemanager.moc browserbar.moc playlistbrowser.moc statistics.moc deletedialog.moc ktrm.moc hintlineedit.moc directorylist.moc mediabrowser.moc moodbar.moc mediumpluginmanager.moc tagdialog.moc enginecontroller.moc contextbrowser.moc xmlloader.moc devicemanager.moc collectionbrowser.moc refreshimages.moc app.moc playlistbrowseritem.moc htmlview.moc smartplaylisteditor.moc podcastsettings.moc mydiroperator.moc columnlist.moc filebrowser.moc actionclasses.moc mountpointmanager.moc scrobbler.moc prettypopupmenu.moc osd.moc scriptmanager.moc configdialog.moc transferdialog.moc equalizersetup.moc playlistwindow.moc metabundlesaver.moc tooltip.moc tracktooltip.moc clicklineedit.moc socketserver.moc playlistselection.moc playlistloader.moc scancontroller.moc equalizerpresetmanager.moc collectiondb.moc deviceconfiguredialog.moc xmlloader_p.moc queuemanager.moc multitabbar.moc covermanager.moc playlist.moc multitabbar_p.moc threadweaver.moc trackpickerdialog.moc lastfm.moc playerwindow.moc enginebase.moc coverfetcher.moc pixmapviewer.moc cuefile.moc sliderwidget.moc #>+ 2 -KDE_DIST=firstrunwizard.ui amarokui_xmms.rc playlistbrowser.h refreshimages.h equalizersetup.h Options5.ui.h trackpickerdialogbase.ui Options2.ui amarok.desktop pixmapviewer.h amarok_codecinstall.desktop podcastsettings.h transferdialog.h mydiroperator.h ktrm.h Options4.ui mediadevicemanager.h statistics.h SConscript scriptmanager.h playlistwindow.h amarok.h playlistloader.h playlistbrowseritem.h medium.h engineobserver.h Options7.ui hintlineedit.h tagguesserconfigdialog.ui socketserver.h playerwindow.h deletedialogbase.ui atomicstring.h hi22-app-amarok.png xmlloader.h Options8.ui queuemanager.h tracktooltip.h threadweaver.h tagguesser.h collectionbrowser.h mountpointmanager.h hi128-app-amarok.png browserbar.h moodbar.h newdynamic.ui playlistitem.h collectiondb.h contextbrowser.h enginebase.h amarok_append.desktop playlistselection.h deviceconfiguredialog.h amarok_proxy.rb directorylist.h osd.h debug.h hi64-app-amarok.png scrobbler.h Makefile.in amarokpcast.protocol qstringx.h tagdialog.h organizecollectiondialog.ui.h amarokrc organizecollectiondialog.ui xmlloader_p.h lastfm.h pluginmanager.h systray.h enginecontroller.h amarok.profile.xml firstrunwizard.ui.h cuefile.h bcpp.cfg tagdialogbase.ui.h amarok_export.h amaroklastfm.protocol mydirlister.h smartplaylisteditor.h hi32-app-amarok.png tagdialogbase.ui sliderwidget.h tooltip.h atomicurl.h actionclasses.h expression.h Options2.ui.h hi48-app-amarok.png fht.h dynamicmode.h columnlist.h filebrowser.h podcastbundle.h clicklineedit.h equalizergraph.h xspfplaylist.h multitabbar_p.h colorgenerator.h k3bexporter.h scriptmanagerbase.ui engine_fwd.h playlist.h devicemanager.h multitabbar.h metabundle.h amarok_plugin.desktop amarokui.rc prettypopupmenu.h htmlview.h configdialog.h browserToolBar.h hi16-app-amarok.png dbsetup.ui podcastsettingsbase.ui app.h tagguesserconfigdialog.ui.h deletedialog.h Options1.ui covermanager.h scancontroller.h amarokitpc.protocol kbookmarkhandler.h metabundlesaver.h mediumpluginmanager.h Options8.ui.h mediabrowser.h trackpickerdialog.h tdebug.h equalizerpresetmanager.h Options5.ui Makefile.am coverfetcher.h +KDE_DIST=firstrunwizard.ui amarokui_xmms.rc playlistbrowser.h equalizersetup.h refreshimages.h Options2.ui Options5.ui.h trackpickerdialogbase.ui pixmapviewer.h amarok.desktop podcastsettings.h amarok_codecinstall.desktop transferdialog.h mydiroperator.h ktrm.h Options4.ui mediadevicemanager.h statistics.h SConscript playlistwindow.h amarok.h scriptmanager.h playlistloader.h playlistbrowseritem.h medium.h Options7.ui engineobserver.h hintlineedit.h tagguesserconfigdialog.ui socketserver.h playerwindow.h deletedialogbase.ui atomicstring.h hi22-app-amarok.png xmlloader.h Options8.ui queuemanager.h tracktooltip.h threadweaver.h tagguesser.h collectionbrowser.h mountpointmanager.h hi128-app-amarok.png browserbar.h newdynamic.ui moodbar.h collectiondb.h playlistitem.h contextbrowser.h enginebase.h amarok_append.desktop playlistselection.h deviceconfiguredialog.h amarok_proxy.rb directorylist.h osd.h debug.h hi64-app-amarok.png scrobbler.h qstringx.h Makefile.in amarokpcast.protocol tagdialog.h amarokrc organizecollectiondialog.ui.h organizecollectiondialog.ui lastfm.h xmlloader_p.h pluginmanager.h systray.h enginecontroller.h firstrunwizard.ui.h amarok.profile.xml cuefile.h bcpp.cfg tagdialogbase.ui.h amarok_export.h amaroklastfm.protocol mydirlister.h smartplaylisteditor.h hi32-app-amarok.png tagdialogbase.ui sliderwidget.h tooltip.h actionclasses.h atomicurl.h expression.h Options2.ui.h hi48-app-amarok.png fht.h dynamicmode.h columnlist.h filebrowser.h podcastbundle.h clicklineedit.h xspfplaylist.h equalizergraph.h multitabbar_p.h colorgenerator.h scriptmanagerbase.ui k3bexporter.h engine_fwd.h playlist.h devicemanager.h multitabbar.h metabundle.h amarok_plugin.desktop amarokui.rc prettypopupmenu.h htmlview.h configdialog.h browserToolBar.h hi16-app-amarok.png podcastsettingsbase.ui dbsetup.ui app.h tagguesserconfigdialog.ui.h deletedialog.h covermanager.h Options1.ui scancontroller.h amarokitpc.protocol kbookmarkhandler.h mediumpluginmanager.h metabundlesaver.h Options8.ui.h mediabrowser.h trackpickerdialog.h tdebug.h equalizerpresetmanager.h Options5.ui Makefile.am coverfetcher.h #>+ 19 clean-ui: @@ -2030,24 +2037,24 @@ install-kde-icons: $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps $(INSTALL_DATA) $(srcdir)/hi16-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amarok.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps - $(INSTALL_DATA) $(srcdir)/hi128-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/amarok.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps $(INSTALL_DATA) $(srcdir)/hi64-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/amarok.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps $(INSTALL_DATA) $(srcdir)/hi22-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amarok.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps - $(INSTALL_DATA) $(srcdir)/hi32-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amarok.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps $(INSTALL_DATA) $(srcdir)/hi48-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amarok.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps + $(INSTALL_DATA) $(srcdir)/hi128-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/amarok.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps + $(INSTALL_DATA) $(srcdir)/hi32-app-amarok.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amarok.png uninstall-kde-icons: -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amarok.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/amarok.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/amarok.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amarok.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amarok.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amarok.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/amarok.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amarok.png #>+ 15 force-reedit: @@ -2059,9 +2066,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/Makefile + $(AUTOMAKE) --foreign amarok/src/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/Makefile.in @@ -2087,37 +2094,21 @@ done -#>+ 11 -libamarok_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/actionclasses.cpp $(srcdir)/app.cpp $(srcdir)/atomicstring.cpp $(srcdir)/atomicurl.cpp $(srcdir)/browserbar.cpp $(srcdir)/clicklineedit.cpp $(srcdir)/collectionbrowser.cpp $(srcdir)/collectiondb.cpp $(srcdir)/columnlist.cpp $(srcdir)/configdialog.cpp $(srcdir)/contextbrowser.cpp $(srcdir)/coverfetcher.cpp $(srcdir)/covermanager.cpp $(srcdir)/cuefile.cpp $(srcdir)/deletedialog.cpp $(srcdir)/deviceconfiguredialog.cpp $(srcdir)/devicemanager.cpp $(srcdir)/directorylist.cpp $(srcdir)/dynamicmode.cpp $(srcdir)/enginebase.cpp $(srcdir)/enginecontroller.cpp $(srcdir)/engineobserver.cpp $(srcdir)/equalizergraph.cpp $(srcdir)/equalizerpresetmanager.cpp $(srcdir)/equalizersetup.cpp $(srcdir)/expression.cpp $(srcdir)/fht.cpp $(srcdir)/filebrowser.cpp $(srcdir)/hintlineedit.cpp $(srcdir)/htmlview.cpp $(srcdir)/iconloader.cpp $(srcdir)/k3bexporter.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/ktrm.cpp $(srcdir)/lastfm.cpp $(srcdir)/mediabrowser.cpp $(srcdir)/mediadevicemanager.cpp $(srcdir)/medium.cpp $(srcdir)/mediumpluginmanager.cpp $(srcdir)/metabundle.cpp $(srcdir)/metabundlesaver.cpp $(srcdir)/moodbar.cpp $(srcdir)/mountpointmanager.cpp $(srcdir)/multitabbar.cpp $(srcdir)/mydiroperator.cpp $(srcdir)/osd.cpp $(srcdir)/pixmapviewer.cpp $(srcdir)/playerwindow.cpp $(srcdir)/playlist.cpp $(srcdir)/playlistbrowser.cpp $(srcdir)/playlistbrowseritem.cpp $(srcdir)/playlistitem.cpp $(srcdir)/playlistloader.cpp $(srcdir)/playlistselection.cpp $(srcdir)/playlistwindow.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/podcastsettings.cpp $(srcdir)/prettypopupmenu.cpp $(srcdir)/queuemanager.cpp $(srcdir)/refreshimages.cpp $(srcdir)/scancontroller.cpp $(srcdir)/scriptmanager.cpp $(srcdir)/scrobbler.cpp $(srcdir)/sliderwidget.cpp $(srcdir)/smartplaylisteditor.cpp $(srcdir)/socketserver.cpp $(srcdir)/statistics.cpp $(srcdir)/systray.cpp $(srcdir)/tagdialog.cpp $(srcdir)/tagguesser.cpp $(srcdir)/threadweaver.cpp $(srcdir)/tooltip.cpp $(srcdir)/trackpickerdialog.cpp $(srcdir)/tracktooltip.cpp $(srcdir)/transferdialog.cpp $(srcdir)/xmlloader.cpp $(srcdir)/xspfplaylist.cpp Options1.cpp Options2.cpp Options4.cpp Options5.cpp Options7.cpp Options8.cpp dbsetup.cpp deletedialogbase.cpp firstrunwizard.cpp newdynamic.cpp organizecollectiondialog.cpp podcastsettingsbase.cpp scriptmanagerbase.cpp tagdialogbase.cpp tagguesserconfigdialog.cpp trackpickerdialogbase.cpp browserbar.moc playlistbrowser.moc statistics.moc firstrunwizard.moc hintlineedit.moc mediabrowser.moc moodbar.moc trackpickerdialogbase.moc tagguesserconfigdialog.moc Options2.moc refreshimages.moc app.moc devicemanager.moc Options4.moc prettypopupmenu.moc deletedialogbase.moc Options5.moc Options7.moc transferdialog.moc metabundlesaver.moc socketserver.moc playlistselection.moc scancontroller.moc collectiondb.moc deviceconfiguredialog.moc equalizerpresetmanager.moc xmlloader_p.moc tagdialogbase.moc multitabbar.moc multitabbar_p.moc threadweaver.moc scriptmanagerbase.moc cuefile.moc Options8.moc mediadevicemanager.moc deletedialog.moc ktrm.moc directorylist.moc mediumpluginmanager.moc newdynamic.moc tagdialog.moc enginecontroller.moc dbsetup.moc contextbrowser.moc xmlloader.moc collectionbrowser.moc podcastsettingsbase.moc playlistbrowseritem.moc organizecollectiondialog.moc smartplaylisteditor.moc htmlview.moc mydiroperator.moc podcastsettings.moc mountpointmanager.moc actionclasses.moc columnlist.moc filebrowser.moc Options1.moc scrobbler.moc osd.moc scriptmanager.moc configdialog.moc equalizersetup.moc playlistwindow.moc tooltip.moc tracktooltip.moc clicklineedit.moc playlistloader.moc queuemanager.moc covermanager.moc playlist.moc trackpickerdialog.moc lastfm.moc playerwindow.moc pixmapviewer.moc coverfetcher.moc enginebase.moc sliderwidget.moc - @echo 'creating libamarok_la.all_cpp.cpp ...'; \ - rm -f libamarok_la.all_cpp.files libamarok_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libamarok_la.all_cpp.final; \ - for file in actionclasses.cpp app.cpp atomicstring.cpp atomicurl.cpp browserbar.cpp clicklineedit.cpp collectionbrowser.cpp collectiondb.cpp columnlist.cpp configdialog.cpp contextbrowser.cpp coverfetcher.cpp covermanager.cpp cuefile.cpp deletedialog.cpp deviceconfiguredialog.cpp devicemanager.cpp directorylist.cpp dynamicmode.cpp enginebase.cpp enginecontroller.cpp engineobserver.cpp equalizergraph.cpp equalizerpresetmanager.cpp equalizersetup.cpp expression.cpp fht.cpp filebrowser.cpp hintlineedit.cpp htmlview.cpp iconloader.cpp k3bexporter.cpp kbookmarkhandler.cpp ktrm.cpp lastfm.cpp mediabrowser.cpp mediadevicemanager.cpp medium.cpp mediumpluginmanager.cpp metabundle.cpp metabundlesaver.cpp moodbar.cpp mountpointmanager.cpp multitabbar.cpp mydiroperator.cpp osd.cpp pixmapviewer.cpp playerwindow.cpp playlist.cpp playlistbrowser.cpp playlistbrowseritem.cpp playlistitem.cpp playlistloader.cpp playlistselection.cpp playlistwindow.cpp pluginmanager.cpp podcastsettings.cpp prettypopupmenu.cpp queuemanager.cpp refreshimages.cpp scancontroller.cpp scriptmanager.cpp scrobbler.cpp sliderwidget.cpp smartplaylisteditor.cpp socketserver.cpp statistics.cpp systray.cpp tagdialog.cpp tagguesser.cpp threadweaver.cpp tooltip.cpp trackpickerdialog.cpp tracktooltip.cpp transferdialog.cpp xmlloader.cpp xspfplaylist.cpp Options1.cpp Options2.cpp Options4.cpp Options5.cpp Options7.cpp Options8.cpp dbsetup.cpp deletedialogbase.cpp firstrunwizard.cpp newdynamic.cpp organizecollectiondialog.cpp podcastsettingsbase.cpp scriptmanagerbase.cpp tagdialogbase.cpp tagguesserconfigdialog.cpp trackpickerdialogbase.cpp ; do \ - echo "#include \"$$file\"" >> libamarok_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libamarok_la.all_cpp.final; \ - done; \ - cat libamarok_la.all_cpp.final libamarok_la.all_cpp.files > libamarok_la.all_cpp.cpp; \ - rm -f libamarok_la.all_cpp.final libamarok_la.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libamarok_la.all_cpp.cpp - #>+ 3 final: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_final_OBJECTS)" all-am + $(MAKE) all-am #>+ 3 final-install: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_final_OBJECTS)" install-am + $(MAKE) install-am #>+ 3 no-final: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_nofinal_OBJECTS)" all-am + $(MAKE) all-am #>+ 3 no-final-install: - $(MAKE) libamarok_la_OBJECTS="$(libamarok_la_nofinal_OBJECTS)" install-am + $(MAKE) install-am #>+ 3 kde-rpo-clean: --- amarok-1.4.3.orig/amarok/src/images/icons/Makefile.in +++ amarok-1.4.3/amarok/src/images/icons/Makefile.in @@ -99,6 +99,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -191,6 +192,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -239,6 +243,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -246,12 +251,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -274,8 +276,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -289,6 +294,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -321,18 +327,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -389,7 +398,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*) \ @@ -398,9 +407,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -410,9 +419,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/icons/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -427,9 +436,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -572,733 +581,733 @@ .NOEXPORT: #>+ 2 -KDE_DIST=hi22-action-amarok_audioscrobbler.png hi64-action-amarok_add_lyrics.png hi16-action-amarok_rescan.png hi48-action-amarok_circle.png hi48-action-amarok_zoom.png cr22-action-babelfish.png hi22-action-amarok_dynamic.png hi16-action-amarok_info.png hi48-action-amarok_editcopy.png hi22-action-amarok_search.png hi22-action-amarok_visualizations.png hi22-action-amarok_music.png hi48-action-amarok_burn.png hi48-action-amarok_random.png hi22-action-amarok_stop.png cr16-action-wiki.png cr64-action-dynamic.png hi16-action-amarok_playlist.png hi64-action-amarok_repeat_no.png hi16-action-amarok_rewind.png hi48-action-amarok_podcast2.png hi48-action-amarok_visualizations.png hi64-action-amarok_album.png hi16-action-amarok_burn.png hi32-action-amarok_random_no.png hi16-action-amarok_playlist_refresh.png cr16-action-podcast.png hi48-action-amarok_change_language.png hi16-action-amarok_dynamic.png hi16-action-amarok_podcast.png hi64-action-amarok_favourite_genres.png hi16-action-amarok_zoom.png hi48-action-amarok_random_no.png hi64-action-collection.png hi22-action-amarok_add_playlist.png hi16-action-amarok_search.png hi22-action-amarok_equalizer.png hi22-action-amarok_repeat_playlist.png hi64-action-amarok_dynamic.png hi16-action-amarok_artist.png hi32-action-amarok_play.png hi64-action-amarok_scripts.png hi16-action-amarok_album.png hi32-action-amarok_info.png hi32-action-audioscrobbler.png hi32-action-amarok_remove.png hi48-action-amarok_settings_indicator.png hi22-action-amarok_back.png hi64-action-amarok_random.png hi48-action-amarok_files2.png hi22-action-amarok_album.png hi16-action-amarok_scripts.png hi16-action-amarok_pause.png hi64-action-amarok_next.png hi64-action-amarok_random_no.png hi64-action-amarok_music.png hi32-action-amarok_settings_general.png hi48-action-amarok_refresh.png hi32-action-amarok_settings_engine.png hi16-action-amarok_music.png hi48-action-amarok_podcast.png hi64-action-amarok_repeat_album.png hi64-action-amarok_change_language.png hi48-action-amarok_next.png hi16-action-amarok_editcopy.png hi22-action-amarok_files2.png hi22-action-amarok_rewind.png hi32-action-amarok_podcast.png hi48-action-amarok_love.png hi48-action-amarok_scripts.png Makefile.in hi32-action-amarok_dynamic.png hi22-action-amarok_favourite_genres.png hi64-action-amarok_files.png hi22-action-amarok_files.png hi22-action-amarok_podcast2.png hi48-action-amarok_settings_engine.png hi64-action-amarok_device.png hi48-action-amarok_pause.png hi32-action-amarok_files2.png hi48-action-amarok_album.png hi16-action-amarok_remove_from_playlist.png hi48-action-amarok_download.png hi16-action-amarok_files.png hi22-action-amarok_next.png hi64-action-amarok_pause.png hi48-action-amarok_settings_general.png hi48-action-amarok_repeat_track.png hi48-action-amarok_device.png hi16-action-amarok_mostplayed.png hi22-action-amarok_covermanager.png hi32-action-amarok_love.png hi64-action-amarok_remove.png hi16-action-amarok_settings_view.png hi16-action-amarok_fastforward.png hi22-action-amarok_random.png hi16-action-amarok_edit.png hi64-action-amarok_repeat_playlist.png hi64-action-amarok_remove_from_playlist.png hi48-action-amarok_lyrics.png hi64-action-amarok_save.png hi48-action-amarok_covermanager.png hi22-action-amarok_repeat_album.png hi64-action-amarok_equalizer.png cr16-action-random.png hi32-action-collection.png hi64-action-amarok_refresh.png hi64-action-amarok_playlist_clear.png hi64-action-amarok_queue.png hi48-action-amarok_artist.png hi48-action-amarok_random_album.png hi22-action-amarok_settings_general.png hi16-action-amarok_audioscrobbler.png hi22-action-amarok_random_track.png hi22-action-amarok_zoom.png hi32-action-amarok_download.png hi32-action-amarok_equalizer.png hi64-action-amarok_settings_engine.png cr22-action-dynamic.png hi22-action-amarok_device.png hi22-action-amarok_burn.png hi32-action-amarok_change_language.png hi22-action-amarok_rescan.png hi64-action-amarok_podcast2.png hi16-action-amarok_save.png hi48-action-amarok_repeat_playlist.png hi32-action-amarok_pause.png hi22-action-amarok_fastforward.png hi16-action-amarok_settings_general.png cr16-action-equalizer.png cr64-action-podcast.png hi22-action-collection.png hi32-action-amarok_collection.png hi64-action-amarok_settings_indicator.png hi32-action-amarok_mostplayed.png hi32-action-amarok_covermanager.png hi32-action-amarok_circle.png hi48-action-amarok_external.png hi22-action-amarok_settings_engine.png hi32-action-amarok_scripts.png hi22-action-amarok_external.png hi64-action-amarok_editcopy.png hi64-action-amarok_covermanager.png hi32-action-amarok_queue.png hi22-action-amarok_save.png hi48-action-amarok_info.png hi64-action-amarok_playlist_refresh.png hi22-action-amarok_refresh.png hi32-action-amarok_rewind.png hi32-action-amarok_clock.png cr16-action-mini_dock.png cr16-action-repeat_playlist.png cr16-action-covermanager.png hi64-action-amarok_stop.png hi32-action-amarok_search.png hi48-action-amarok_track.png hi22-action-amarok_mostplayed.png hi16-action-amarok_redo.png cr22-action-repeat_playlist.png hi48-action-amarok_repeat_album.png hi48-action-amarok_add_playlist.png hi22-action-amarok_settings_view.png hi48-action-amarok_settings_view.png hi48-action-amarok_settings_playback.png hi16-action-amarok_repeat_playlist.png hi48-action-amarok_repeat_no.png hi64-action-amarok_edit.png hi32-action-amarok_playlist.png hi48-action-amarok_favourite_genres.png hi32-action-amarok_album.png hi16-action-amarok_settings_indicator.png cr64-action-repeat_playlist.png hi32-action-amarok_device.png hi16-action-amarok_configure.png hi16-action-amarok_lyrics.png hi32-action-amarok_undo.png hi32-action-amarok_random_album.png hi32-action-amarok_back.png hi16-action-amarok_change_language.png hi22-action-amarok_scripts.png hi16-action-amarok_favourite_genres.png hi64-action-amarok_configure.png hi64-action-amarok_love.png hi48-action-amarok_playlist.png cr64-action-podcast_new.png hi22-action-amarok_settings_indicator.png hi48-action-amarok_equalizer.png hi64-action-amarok_artist.png hi64-action-amarok_collection.png hi32-action-amarok_repeat_no.png hi48-action-amarok_playlist_refresh.png hi22-action-amarok_artist.png hi16-action-amarok_visualizations.png hi22-action-amarok_podcast.png hi22-action-amarok_remove.png hi32-action-amarok_add_playlist.png hi32-action-amarok_repeat_playlist.png hi16-action-amarok_device.png hi64-action-amarok_burn.png hi16-action-amarok_repeat_track.png hi64-action-amarok_info.png hi64-action-amarok_playlist.png hi64-action-amarok_circle.png hi64-action-amarok_settings_view.png hi32-action-amarok_music.png hi64-action-amarok_podcast.png hi32-action-amarok_save.png hi48-action-amarok_clock.png hi64-action-amarok_add_playlist.png hi48-action-amarok_audioscrobbler.png hi22-action-amarok_editcopy.png hi22-action-amarok_circle.png hi16-action-amarok_add_lyrics.png hi48-action-amarok_remove_from_playlist.png hi32-action-amarok_random.png cr64-action-random.png hi22-action-amarok_info.png hi22-action-amarok_playlist_clear.png hi32-action-amarok_playlist_clear.png hi16-action-amarok_external.png hi32-action-amarok_lyrics.png hi48-action-amarok_undo.png hi32-action-amarok_burn.png hi16-action-amarok_remove.png hi48-action-collection.png hi48-action-amarok_play.png hi16-action-amarok_repeat_no.png hi22-action-amarok_remove_from_playlist.png hi48-action-amarok_files.png hi16-action-collection.png hi64-action-amarok_rescan.png hi22-action-amarok_track.png hi22-action-amarok_queue.png hi22-action-amarok_change_language.png hi22-action-amarok_repeat_track.png hi22-action-amarok_playlist.png hi16-action-amarok_podcast2.png hi22-action-amarok_play.png hi16-action-amarok_random_no.png hi16-action-amarok_settings_playback.png hi16-action-amarok_random.png cr16-action-player_playlist_2.png hi32-action-amarok_zoom.png hi16-action-amarok_circle.png hi32-action-amarok_rescan.png hi16-action-amarok_clock.png hi16-action-amarok_track.png hi48-action-amarok_dynamic.png hi32-action-amarok_remove_from_playlist.png hi16-action-amarok_refresh.png hi64-action-amarok_fastforward.png hi48-action-amarok_fastforward.png hi32-action-amarok_editcopy.png hi22-action-amarok_repeat_no.png hi32-action-amarok_settings_indicator.png hi32-action-amarok_track.png hi32-action-amarok_external.png hi32-action-amarok_refresh.png hi48-action-amarok_save.png cr22-action-amarok_podcast.png hi64-action-amarok_settings_playback.png hi64-action-amarok_visualizations.png hi22-action-amarok_configure.png hi64-action-amarok_random_album.png hi32-action-amarok_podcast2.png hi22-action-amarok_lyrics.png hi48-action-amarok_redo.png cr22-action-amarok_podcast_new.png hi16-action-amarok_next.png hi32-action-amarok_repeat_album.png hi48-action-amarok_remove.png hi22-action-amarok_edit.png hi16-action-amarok_files2.png hi32-action-amarok_repeat_track.png hi16-action-amarok_equalizer.png cr16-action-repeat_track.png hi32-action-amarok_add_lyrics.png hi22-action-amarok_random_album.png hi22-action-amarok_settings_playback.png hi22-action-amarok_redo.png hi16-action-amarok_back.png hi48-action-amarok_search.png hi48-action-amarok_configure.png hi64-action-amarok_clock.png hi16-action-amarok_covermanager.png hi22-action-amarok_clock.png hi22-action-amarok_undo.png hi16-action-amarok_undo.png hi48-action-amarok_music.png hi48-action-amarok_rewind.png hi64-action-amarok_back.png hi64-action-amarok_rewind.png hi16-action-amarok_settings_engine.png hi16-action-amarok_random_track.png hi64-action-amarok_random_track.png hi64-action-amarok_search.png hi22-action-amarok_random_no.png hi32-action-amarok_visualizations.png hi48-action-amarok_stop.png hi16-action-amarok_queue.png hi48-action-amarok_edit.png hi64-action-amarok_lyrics.png hi48-action-amarok_random_track.png hi64-action-amarok_audioscrobbler.png hi16-action-amarok_stop.png hi22-action-amarok_add_lyrics.png hi32-action-amarok_files.png hi64-action-amarok_files2.png hi64-action-amarok_repeat_track.png cr16-action-dynamic.png hi64-action-amarok_redo.png hi48-action-amarok_playlist_clear.png hi64-action-amarok_settings_general.png hi22-action-amarok_pause.png hi16-action-amarok_random_album.png hi22-action-amarok_love.png hi32-action-amarok_next.png cr22-action-player_playlist_2.png hi16-action-amarok_download.png hi32-action-amarok_edit.png hi32-action-amarok_random_track.png hi16-action-amarok_repeat_album.png cr22-action-random.png hi48-action-amarok_back.png hi48-action-amarok_collection.png hi22-action-amarok_collection.png hi64-action-amarok_mostplayed.png hi48-action-amarok_add_lyrics.png hi32-action-amarok_configure.png hi48-action-amarok_queue.png hi64-action-amarok_external.png hi48-action-amarok_mostplayed.png hi64-action-amarok_zoom.png hi32-action-amarok_settings_playback.png hi32-action-amarok_favourite_genres.png hi32-action-amarok_artist.png hi16-action-amarok_playlist_clear.png hi64-action-amarok_undo.png hi32-action-amarok_audioscrobbler.png hi64-action-amarok_track.png hi32-action-amarok_stop.png hi48-action-amarok_rescan.png cr16-action-visualizations.png cr16-action-podcast_new.png hi22-action-amarok_playlist_refresh.png hi32-action-amarok_playlist_refresh.png hi22-action-amarok_download.png hi16-action-amarok_play.png hi16-action-amarok_add_playlist.png hi16-action-amarok_collection.png hi32-action-amarok_redo.png hi64-action-amarok_play.png hi64-action-amarok_download.png hi32-action-amarok_fastforward.png hi16-action-amarok_love.png Makefile.am hi32-action-amarok_settings_view.png +KDE_DIST=hi22-action-amarok_audioscrobbler.png hi64-action-amarok_add_lyrics.png hi16-action-amarok_rescan.png hi48-action-amarok_circle.png hi48-action-amarok_zoom.png cr22-action-babelfish.png hi16-action-amarok_info.png hi22-action-amarok_dynamic.png hi48-action-amarok_editcopy.png hi22-action-amarok_search.png hi22-action-amarok_visualizations.png hi22-action-amarok_music.png hi48-action-amarok_random.png hi48-action-amarok_burn.png hi22-action-amarok_stop.png cr16-action-wiki.png cr64-action-dynamic.png hi16-action-amarok_playlist.png hi64-action-amarok_repeat_no.png hi16-action-amarok_rewind.png hi48-action-amarok_podcast2.png hi64-action-amarok_album.png hi48-action-amarok_visualizations.png hi16-action-amarok_burn.png hi32-action-amarok_random_no.png hi16-action-amarok_playlist_refresh.png cr16-action-podcast.png hi48-action-amarok_change_language.png hi16-action-amarok_dynamic.png hi16-action-amarok_podcast.png hi16-action-amarok_zoom.png hi64-action-amarok_favourite_genres.png hi48-action-amarok_random_no.png hi64-action-collection.png hi16-action-amarok_search.png hi22-action-amarok_add_playlist.png hi22-action-amarok_equalizer.png hi22-action-amarok_repeat_playlist.png hi64-action-amarok_dynamic.png hi64-action-amarok_scripts.png hi32-action-amarok_play.png hi16-action-amarok_artist.png hi16-action-amarok_album.png hi32-action-amarok_info.png hi32-action-audioscrobbler.png hi32-action-amarok_remove.png hi48-action-amarok_settings_indicator.png hi64-action-amarok_random.png hi22-action-amarok_back.png hi48-action-amarok_files2.png hi22-action-amarok_album.png hi16-action-amarok_scripts.png hi16-action-amarok_pause.png hi64-action-amarok_next.png hi64-action-amarok_random_no.png hi64-action-amarok_music.png hi32-action-amarok_settings_general.png hi48-action-amarok_refresh.png hi32-action-amarok_settings_engine.png hi16-action-amarok_music.png hi48-action-amarok_podcast.png hi64-action-amarok_repeat_album.png hi64-action-amarok_change_language.png hi48-action-amarok_next.png hi16-action-amarok_editcopy.png hi22-action-amarok_files2.png hi22-action-amarok_rewind.png hi32-action-amarok_podcast.png hi48-action-amarok_scripts.png Makefile.in hi48-action-amarok_love.png hi32-action-amarok_dynamic.png hi22-action-amarok_favourite_genres.png hi64-action-amarok_files.png hi22-action-amarok_files.png hi22-action-amarok_podcast2.png hi48-action-amarok_settings_engine.png hi64-action-amarok_device.png hi32-action-amarok_files2.png hi48-action-amarok_pause.png hi48-action-amarok_album.png hi48-action-amarok_download.png hi16-action-amarok_remove_from_playlist.png hi16-action-amarok_files.png hi64-action-amarok_pause.png hi22-action-amarok_next.png hi48-action-amarok_settings_general.png hi48-action-amarok_repeat_track.png hi48-action-amarok_device.png hi16-action-amarok_mostplayed.png hi22-action-amarok_covermanager.png hi32-action-amarok_love.png hi64-action-amarok_remove.png hi16-action-amarok_settings_view.png hi16-action-amarok_fastforward.png hi22-action-amarok_random.png hi16-action-amarok_edit.png hi64-action-amarok_remove_from_playlist.png hi64-action-amarok_repeat_playlist.png hi48-action-amarok_lyrics.png hi64-action-amarok_save.png hi48-action-amarok_covermanager.png hi22-action-amarok_repeat_album.png hi64-action-amarok_equalizer.png cr16-action-random.png hi32-action-collection.png hi64-action-amarok_refresh.png hi64-action-amarok_queue.png hi64-action-amarok_playlist_clear.png hi48-action-amarok_artist.png hi48-action-amarok_random_album.png hi22-action-amarok_settings_general.png hi22-action-amarok_random_track.png hi16-action-amarok_audioscrobbler.png hi22-action-amarok_zoom.png hi32-action-amarok_download.png hi32-action-amarok_equalizer.png hi64-action-amarok_settings_engine.png hi22-action-amarok_device.png cr22-action-dynamic.png hi32-action-amarok_change_language.png hi22-action-amarok_rescan.png hi22-action-amarok_burn.png hi48-action-amarok_repeat_playlist.png hi64-action-amarok_podcast2.png hi16-action-amarok_save.png hi32-action-amarok_pause.png hi16-action-amarok_settings_general.png hi22-action-amarok_fastforward.png cr16-action-equalizer.png cr64-action-podcast.png hi22-action-collection.png hi32-action-amarok_collection.png hi64-action-amarok_settings_indicator.png hi32-action-amarok_mostplayed.png hi32-action-amarok_circle.png hi32-action-amarok_covermanager.png hi48-action-amarok_external.png hi22-action-amarok_settings_engine.png hi32-action-amarok_scripts.png hi22-action-amarok_external.png hi64-action-amarok_editcopy.png hi64-action-amarok_covermanager.png hi32-action-amarok_queue.png hi22-action-amarok_save.png hi48-action-amarok_info.png hi64-action-amarok_playlist_refresh.png hi22-action-amarok_refresh.png hi32-action-amarok_rewind.png hi32-action-amarok_clock.png cr16-action-mini_dock.png cr16-action-repeat_playlist.png hi64-action-amarok_stop.png cr16-action-covermanager.png hi32-action-amarok_search.png hi48-action-amarok_track.png hi22-action-amarok_mostplayed.png hi16-action-amarok_redo.png cr22-action-repeat_playlist.png hi48-action-amarok_repeat_album.png hi22-action-amarok_settings_view.png hi48-action-amarok_add_playlist.png hi48-action-amarok_settings_view.png hi48-action-amarok_settings_playback.png hi16-action-amarok_repeat_playlist.png hi48-action-amarok_repeat_no.png hi64-action-amarok_edit.png hi32-action-amarok_playlist.png hi48-action-amarok_favourite_genres.png hi32-action-amarok_album.png hi16-action-amarok_settings_indicator.png cr64-action-repeat_playlist.png hi32-action-amarok_device.png hi16-action-amarok_configure.png hi16-action-amarok_lyrics.png hi32-action-amarok_random_album.png hi16-action-amarok_change_language.png hi32-action-amarok_undo.png hi32-action-amarok_back.png hi22-action-amarok_scripts.png hi16-action-amarok_favourite_genres.png hi64-action-amarok_configure.png hi64-action-amarok_love.png hi48-action-amarok_playlist.png hi22-action-amarok_settings_indicator.png cr64-action-podcast_new.png hi48-action-amarok_equalizer.png hi64-action-amarok_artist.png hi64-action-amarok_collection.png hi32-action-amarok_repeat_no.png hi48-action-amarok_playlist_refresh.png hi22-action-amarok_artist.png hi16-action-amarok_visualizations.png hi22-action-amarok_podcast.png hi22-action-amarok_remove.png hi32-action-amarok_add_playlist.png hi32-action-amarok_repeat_playlist.png hi16-action-amarok_device.png hi16-action-amarok_repeat_track.png hi64-action-amarok_info.png hi64-action-amarok_burn.png hi64-action-amarok_playlist.png hi64-action-amarok_circle.png hi64-action-amarok_settings_view.png hi32-action-amarok_music.png hi32-action-amarok_save.png hi64-action-amarok_podcast.png hi48-action-amarok_clock.png hi64-action-amarok_add_playlist.png hi48-action-amarok_audioscrobbler.png hi22-action-amarok_editcopy.png hi22-action-amarok_circle.png hi16-action-amarok_add_lyrics.png hi48-action-amarok_remove_from_playlist.png hi32-action-amarok_random.png cr64-action-random.png hi22-action-amarok_info.png hi22-action-amarok_playlist_clear.png hi32-action-amarok_playlist_clear.png hi16-action-amarok_external.png hi32-action-amarok_lyrics.png hi48-action-amarok_undo.png hi32-action-amarok_burn.png hi48-action-collection.png hi16-action-amarok_remove.png hi48-action-amarok_play.png hi16-action-amarok_repeat_no.png hi22-action-amarok_remove_from_playlist.png hi48-action-amarok_files.png hi16-action-collection.png hi22-action-amarok_track.png hi64-action-amarok_rescan.png hi22-action-amarok_queue.png hi22-action-amarok_repeat_track.png hi22-action-amarok_change_language.png hi22-action-amarok_playlist.png hi16-action-amarok_podcast2.png hi16-action-amarok_random_no.png hi22-action-amarok_play.png hi16-action-amarok_settings_playback.png hi16-action-amarok_random.png hi32-action-amarok_zoom.png cr16-action-player_playlist_2.png hi16-action-amarok_circle.png hi32-action-amarok_rescan.png hi16-action-amarok_clock.png hi16-action-amarok_track.png hi48-action-amarok_dynamic.png hi16-action-amarok_refresh.png hi32-action-amarok_remove_from_playlist.png hi64-action-amarok_fastforward.png hi32-action-amarok_editcopy.png hi48-action-amarok_fastforward.png hi22-action-amarok_repeat_no.png hi32-action-amarok_settings_indicator.png hi32-action-amarok_track.png hi32-action-amarok_external.png hi32-action-amarok_refresh.png hi48-action-amarok_save.png cr22-action-amarok_podcast.png hi64-action-amarok_settings_playback.png hi64-action-amarok_visualizations.png hi22-action-amarok_configure.png hi32-action-amarok_podcast2.png hi64-action-amarok_random_album.png hi22-action-amarok_lyrics.png hi48-action-amarok_redo.png cr22-action-amarok_podcast_new.png hi16-action-amarok_next.png hi32-action-amarok_repeat_album.png hi48-action-amarok_remove.png hi22-action-amarok_edit.png hi16-action-amarok_files2.png hi16-action-amarok_equalizer.png hi32-action-amarok_repeat_track.png cr16-action-repeat_track.png hi32-action-amarok_add_lyrics.png hi22-action-amarok_random_album.png hi22-action-amarok_settings_playback.png hi16-action-amarok_back.png hi22-action-amarok_redo.png hi48-action-amarok_configure.png hi48-action-amarok_search.png hi16-action-amarok_covermanager.png hi22-action-amarok_clock.png hi64-action-amarok_clock.png hi22-action-amarok_undo.png hi48-action-amarok_music.png hi16-action-amarok_undo.png hi48-action-amarok_rewind.png hi64-action-amarok_rewind.png hi64-action-amarok_back.png hi16-action-amarok_settings_engine.png hi16-action-amarok_random_track.png hi64-action-amarok_random_track.png hi22-action-amarok_random_no.png hi64-action-amarok_search.png hi32-action-amarok_visualizations.png hi16-action-amarok_queue.png hi48-action-amarok_stop.png hi64-action-amarok_lyrics.png hi48-action-amarok_edit.png hi48-action-amarok_random_track.png hi64-action-amarok_audioscrobbler.png hi16-action-amarok_stop.png hi22-action-amarok_add_lyrics.png hi64-action-amarok_files2.png hi64-action-amarok_repeat_track.png hi32-action-amarok_files.png hi64-action-amarok_redo.png cr16-action-dynamic.png hi48-action-amarok_playlist_clear.png hi64-action-amarok_settings_general.png hi22-action-amarok_pause.png hi16-action-amarok_random_album.png hi22-action-amarok_love.png hi32-action-amarok_next.png cr22-action-player_playlist_2.png hi16-action-amarok_download.png hi32-action-amarok_edit.png hi32-action-amarok_random_track.png hi48-action-amarok_back.png hi16-action-amarok_repeat_album.png cr22-action-random.png hi48-action-amarok_collection.png hi22-action-amarok_collection.png hi64-action-amarok_mostplayed.png hi48-action-amarok_add_lyrics.png hi32-action-amarok_configure.png hi48-action-amarok_queue.png hi64-action-amarok_external.png hi48-action-amarok_mostplayed.png hi64-action-amarok_zoom.png hi32-action-amarok_settings_playback.png hi32-action-amarok_favourite_genres.png hi32-action-amarok_artist.png hi16-action-amarok_playlist_clear.png hi64-action-amarok_undo.png hi32-action-amarok_audioscrobbler.png hi64-action-amarok_track.png hi32-action-amarok_stop.png hi48-action-amarok_rescan.png cr16-action-visualizations.png cr16-action-podcast_new.png hi22-action-amarok_playlist_refresh.png hi32-action-amarok_playlist_refresh.png hi22-action-amarok_download.png hi16-action-amarok_play.png hi16-action-amarok_add_playlist.png hi16-action-amarok_collection.png hi32-action-amarok_redo.png hi64-action-amarok_play.png hi64-action-amarok_download.png hi16-action-amarok_love.png hi32-action-amarok_fastforward.png Makefile.am hi32-action-amarok_settings_view.png #>+ 2 docs-am: #>+ 722 install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions + $(INSTALL_DATA) $(srcdir)/cr22-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_next.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_circle.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions - $(INSTALL_DATA) $(srcdir)/cr64-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_circle.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_clock.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions - $(INSTALL_DATA) $(srcdir)/cr16-action-visualizations.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions + $(INSTALL_DATA) $(srcdir)/hi16-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions + $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_track.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_track.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_scripts.png - $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions - $(INSTALL_DATA) $(srcdir)/cr22-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/cr64-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png $(INSTALL_DATA) $(srcdir)/cr16-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/dynamic.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png + $(mkinstalldirs) $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions + $(INSTALL_DATA) $(srcdir)/cr64-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/cr22-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_stop.png + $(INSTALL_DATA) $(srcdir)/cr16-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_playback.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_scripts.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_collection.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_visualizations.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/cr16-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/cr64-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/cr64-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/hi32-action-audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/cr16-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png - $(INSTALL_DATA) $(srcdir)/hi22-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png + $(INSTALL_DATA) $(srcdir)/cr64-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_circle.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_change_language.png + $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_stop.png + $(INSTALL_DATA) $(srcdir)/cr16-action-visualizations.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_engine.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_track.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_circle.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi32-action-audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png + $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_scripts.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_clear.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_visualizations.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi64-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_stop.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_edit.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_dynamic.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/cr16-action-covermanager.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png $(INSTALL_DATA) $(srcdir)/cr16-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/random.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi16-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/collection.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png $(INSTALL_DATA) $(srcdir)/cr16-action-wiki.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/wiki.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_equalizer.png + $(INSTALL_DATA) $(srcdir)/cr22-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi32-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_audioscrobbler.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_playback.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_external.png + $(INSTALL_DATA) $(srcdir)/cr22-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi22-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/collection.png + $(INSTALL_DATA) $(srcdir)/cr64-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_configure.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_artist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png - $(INSTALL_DATA) $(srcdir)/hi48-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_artist.png - $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png - $(INSTALL_DATA) $(srcdir)/cr16-action-repeat_track.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png - $(INSTALL_DATA) $(srcdir)/cr64-action-repeat_playlist.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_scripts.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/cr16-action-mini_dock.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_engine.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/cr22-action-dynamic.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/cr64-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_pause.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_visualizations.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/cr16-action-player_playlist_2.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_dynamic.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_engine.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_engine.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_next.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png + $(INSTALL_DATA) $(srcdir)/cr22-action-random.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_favourite_genres.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_play.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_mostplayed.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_random.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_editcopy.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_editcopy.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_files2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_music.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_burn.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_circle.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_circle.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_album.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_rescan.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rescan.png - $(INSTALL_DATA) $(srcdir)/cr16-action-covermanager.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_mostplayed.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_mostplayed.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_info.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_save.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/cr22-action-babelfish.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_edit.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_rewind.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_repeat_track.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_no.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_view.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_scripts.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_scripts.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_visualizations.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_album.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_random_album.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_stop.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_search.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_device.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_device.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_queue.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png + $(INSTALL_DATA) $(srcdir)/hi48-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/collection.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_settings_view.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_no.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png + $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_redo.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png + $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_download.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_download.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/cr16-action-podcast.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_track.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_indicator.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_playlist_clear.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_fastforward.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_change_language.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png - $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_next.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_back.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi32-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_audioscrobbler.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_burn.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_covermanager.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png - $(INSTALL_DATA) $(srcdir)/cr22-action-amarok_podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_love.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_podcast2.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png - $(INSTALL_DATA) $(srcdir)/cr64-action-podcast_new.png $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png - $(INSTALL_DATA) $(srcdir)/cr22-action-babelfish.png $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png + $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_collection.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_collection.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_album.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_clock.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_equalizer.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_files.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_settings_general.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_undo.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_artist.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_repeat_album.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png - $(INSTALL_DATA) $(srcdir)/hi64-action-collection.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png - $(INSTALL_DATA) $(srcdir)/cr16-action-mini_dock.png $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_settings_playback.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_random_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_play.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_repeat_no.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_no.png - $(INSTALL_DATA) $(srcdir)/hi16-action-amarok_add_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_add_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png - $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_favourite_genres.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_favourite_genres.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_playlist_refresh.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_refresh.png - $(INSTALL_DATA) $(srcdir)/hi32-action-amarok_external.png $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png - $(INSTALL_DATA) $(srcdir)/hi22-action-amarok_zoom.png $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_zoom.png + $(INSTALL_DATA) $(srcdir)/hi48-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_remove_from_playlist.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_lyrics.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png + $(INSTALL_DATA) $(srcdir)/hi64-action-amarok_track.png $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_track.png uninstall-kde-icons: - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_view.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_playback.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_scripts.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_back.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_playback.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_mostplayed.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_engine.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_scripts.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_visualizations.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/random.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_lyrics.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/random.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/wiki.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_add_playlist.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_configure.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_device.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast_new.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_pause.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_mostplayed.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/player_playlist_2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_external.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_audioscrobbler.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_refresh.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_circle.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_external.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/repeat_playlist.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/random.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/wiki.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_mostplayed.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_configure.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_indicator.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files2.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_search.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_collection.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_artist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_back.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_clear.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_pause.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_queue.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_zoom.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_scripts.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_playlist.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_engine.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_mostplayed.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_remove_from_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/dynamic.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_pause.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_visualizations.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_edit.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_redo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/player_playlist_2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_editcopy.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_dynamic.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_engine.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_next.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_fastforward.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_files.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_favourite_genres.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_play.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_playlist_refresh.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_editcopy.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rescan.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_clear.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_save.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_mostplayed.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_info.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_save.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_random.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_rescan.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_playlist_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_files2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_music.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_info.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_burn.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_circle.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_rescan.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_edit.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_rewind.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_repeat_track.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_view.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_clock.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_scripts.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_visualizations.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_undo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_random_album.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_stop.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_covermanager.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_general.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_search.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_equalizer.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_back.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_device.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_download.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_refresh.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_queue.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/collection.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_love.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_settings_view.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_no.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_repeat_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_redo.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_track.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_download.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/podcast.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_indicator.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_playlist_clear.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_fastforward.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_change_language.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_next.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_back.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_audioscrobbler.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_burn.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_covermanager.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/amarok_podcast_new.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_love.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_podcast2.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/64x64/actions/podcast_new.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/22x22/actions/babelfish.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_add_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_play.png -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_collection.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_clock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_equalizer.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_files.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_settings_general.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_undo.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_artist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_repeat_album.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/collection.png - -rm -f $(DESTDIR)$(amarokicondir)/crystalsvg/16x16/actions/mini_dock.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_settings_playback.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_random_track.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_play.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_repeat_no.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/16x16/actions/amarok_add_playlist.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_add_lyrics.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_favourite_genres.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_playlist_refresh.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/32x32/actions/amarok_external.png - -rm -f $(DESTDIR)$(amarokicondir)/hicolor/22x22/actions/amarok_zoom.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/48x48/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_remove_from_playlist.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_lyrics.png + -rm -f $(DESTDIR)$(amarokicondir)/hicolor/64x64/actions/amarok_track.png #>+ 15 force-reedit: @@ -1310,9 +1319,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/icons/Makefile + $(AUTOMAKE) --foreign amarok/src/images/icons/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/icons/Makefile.in --- amarok-1.4.3.orig/amarok/src/images/Makefile.in +++ amarok-1.4.3/amarok/src/images/Makefile.in @@ -125,6 +125,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -217,6 +218,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -265,6 +269,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -272,12 +277,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -300,8 +302,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -315,6 +320,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -347,18 +353,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -465,7 +474,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*) \ @@ -474,9 +483,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/images/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/images/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -486,9 +495,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/Makefile + $(AUTOMAKE) --foreign amarok/src/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -503,9 +512,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -813,7 +822,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=xine_logo.png volumeslider-inset.png currenttrack_stop.png amarok_logo_old.svg pl_active2.png amarok_rocks.xcf currenttrack_bar_mid.png eq_active2.png volumeslider-handle.png currenttrack_stop_small.png b_next.png pl_inactive2.png smallstar.png Makefile.in shadow_albumcover.png menu_sidepixmap.xcf time_plus.png amarok_logo.svg back_stars_grey.png description.png wizard_compact.png currenttrack_repeat.png menu_sidepixmap.png time_minus.png sound.png sbinner_stars.png amarok_cut.png b_prev.png player_background.jpg nocover.png b_stop.png b_play.png b_pause.png eq_inactive2.png volumeslider-gradient.png currenttrack_play.png splash_screen.jpg loading1.png lastfm.png currenttrack_bar_left.png amarok_rocks.jpg volumeslider-handle_glow.png currenttrack_bar_right.png star.png more_albums.png musicbrainz.png vol_speaker.png wizard_xmms.png currenttrack_pause.png amarok_icon.svg Makefile.am loading2.png currenttrack_repeat_small.png +KDE_DIST=xine_logo.png volumeslider-inset.png currenttrack_stop.png amarok_logo_old.svg pl_active2.png amarok_rocks.xcf currenttrack_bar_mid.png eq_active2.png volumeslider-handle.png currenttrack_stop_small.png b_next.png smallstar.png pl_inactive2.png Makefile.in shadow_albumcover.png menu_sidepixmap.xcf time_plus.png amarok_logo.svg back_stars_grey.png description.png wizard_compact.png currenttrack_repeat.png menu_sidepixmap.png time_minus.png sound.png sbinner_stars.png amarok_cut.png b_prev.png player_background.jpg nocover.png b_stop.png b_play.png b_pause.png eq_inactive2.png volumeslider-gradient.png currenttrack_play.png splash_screen.jpg loading1.png lastfm.png currenttrack_bar_left.png amarok_rocks.jpg volumeslider-handle_glow.png currenttrack_bar_right.png star.png more_albums.png musicbrainz.png vol_speaker.png wizard_xmms.png currenttrack_pause.png amarok_icon.svg Makefile.am loading2.png currenttrack_repeat_small.png #>+ 2 docs-am: @@ -828,9 +837,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/images/Makefile + $(AUTOMAKE) --foreign amarok/src/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/images/Makefile.in --- amarok-1.4.3.orig/amarok/src/loader/Makefile.in +++ amarok-1.4.3/amarok/src/loader/Makefile.in @@ -136,6 +136,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -228,6 +229,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -276,6 +280,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -283,12 +288,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -311,8 +313,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -326,6 +331,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -358,18 +364,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -438,7 +447,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*) \ @@ -447,9 +456,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/loader/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/loader/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/loader/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/loader/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -459,9 +468,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/loader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/loader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/loader/Makefile + $(AUTOMAKE) --foreign amarok/src/loader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/loader/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -476,9 +485,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -744,9 +753,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/loader/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/loader/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/loader/Makefile + $(AUTOMAKE) --foreign amarok/src/loader/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/loader/Makefile.in --- amarok-1.4.3.orig/amarok/src/plugin/Makefile.in +++ amarok-1.4.3/amarok/src/plugin/Makefile.in @@ -136,6 +136,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -228,6 +229,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -276,6 +280,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -283,12 +288,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -311,8 +313,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -326,6 +331,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -358,18 +364,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -442,7 +451,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*) \ @@ -451,9 +460,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/plugin/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/plugin/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/plugin/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/plugin/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -463,9 +472,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/plugin/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/plugin/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/plugin/Makefile + $(AUTOMAKE) --foreign amarok/src/plugin/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/plugin/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -480,9 +489,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -737,9 +746,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/plugin/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/plugin/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/plugin/Makefile + $(AUTOMAKE) --foreign amarok/src/plugin/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/plugin/Makefile.in --- amarok-1.4.3.orig/amarok/src/sqlite/Makefile.in +++ amarok-1.4.3/amarok/src/sqlite/Makefile.in @@ -162,6 +162,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -254,6 +255,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -302,6 +306,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -309,12 +314,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_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,8 +339,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -352,6 +357,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -384,18 +390,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -509,7 +518,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*) \ @@ -518,9 +527,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -530,9 +539,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile + $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/sqlite/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -547,9 +556,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -1120,9 +1129,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/sqlite/Makefile + $(AUTOMAKE) --foreign amarok/src/sqlite/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/sqlite/Makefile.in --- amarok-1.4.3.orig/amarok/src/themes/reinhardt/Makefile.in +++ amarok-1.4.3/amarok/src/themes/reinhardt/Makefile.in @@ -125,6 +125,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -217,6 +218,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -265,6 +269,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -272,12 +277,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -300,8 +302,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -315,6 +320,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -347,18 +353,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -416,7 +425,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*) \ @@ -425,9 +434,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -437,9 +446,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -454,9 +463,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -779,9 +788,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/Makefile.in --- amarok-1.4.3.orig/amarok/src/themes/reinhardt/images/Makefile.in +++ amarok-1.4.3/amarok/src/themes/reinhardt/images/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -399,7 +408,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*) \ @@ -408,9 +417,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -420,9 +429,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/images/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -437,9 +446,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -614,9 +623,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/reinhardt/images/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/reinhardt/images/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/reinhardt/images/Makefile.in --- amarok-1.4.3.orig/amarok/src/themes/example/Makefile.in +++ amarok-1.4.3/amarok/src/themes/example/Makefile.in @@ -109,6 +109,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -201,6 +202,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -249,6 +253,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -256,12 +261,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -284,8 +286,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -299,6 +304,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -331,18 +337,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -399,7 +408,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*) \ @@ -408,9 +417,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -420,9 +429,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/example/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -437,9 +446,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -613,9 +622,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/example/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/example/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/example/Makefile.in --- amarok-1.4.3.orig/amarok/src/themes/Makefile.in +++ amarok-1.4.3/amarok/src/themes/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -404,7 +413,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*) \ @@ -413,9 +422,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/themes/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/themes/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -425,9 +434,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -442,9 +451,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -746,9 +755,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/themes/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/themes/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/themes/Makefile + $(AUTOMAKE) --foreign amarok/src/themes/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/themes/Makefile.in --- amarok-1.4.3.orig/amarok/src/analyzers/Makefile.in +++ amarok-1.4.3/amarok/src/analyzers/Makefile.in @@ -136,6 +136,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -228,6 +229,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -276,6 +280,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -283,12 +288,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -311,8 +313,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -326,6 +331,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -358,18 +364,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -452,7 +461,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*) \ @@ -461,9 +470,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -473,9 +482,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile + $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/analyzers/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -490,9 +499,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -763,9 +772,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/analyzers/Makefile + $(AUTOMAKE) --foreign amarok/src/analyzers/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/analyzers/Makefile.in --- amarok-1.4.3.orig/amarok/src/statusbar/Makefile.in +++ amarok-1.4.3/amarok/src/statusbar/Makefile.in @@ -49,8 +49,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libstatusbar_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libstatusbar_la_LIBADD = am_libstatusbar_la_OBJECTS = statusBarBase.lo statusbar.lo \ overlayWidget.lo popupMessage.lo progressBar.lo \ squeezedtextlabel.lo queueLabel.lo @@ -137,6 +136,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -229,6 +229,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -277,6 +280,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -284,12 +288,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -312,8 +313,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -327,6 +331,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -359,18 +364,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -430,7 +438,6 @@ -I$(top_builddir)/amarok/src/ \ $(all_includes) -libstatusbar_la_LIBADD = $(LIB_QT) libstatusbar_la_SOURCES = \ statusBarBase.cpp \ statusbar.cpp \ @@ -446,7 +453,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*) \ @@ -455,9 +462,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -467,9 +474,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile + $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/statusbar/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -484,9 +491,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -721,13 +728,6 @@ .NOEXPORT: #>+ 3 -queueLabel.moc: $(srcdir)/queueLabel.h - $(MOC) $(srcdir)/queueLabel.h -o queueLabel.moc - -#>+ 2 -mocs: queueLabel.moc - -#>+ 3 selectLabel.moc: $(srcdir)/selectLabel.h $(MOC) $(srcdir)/selectLabel.h -o selectLabel.moc @@ -742,6 +742,13 @@ mocs: statusbar.moc #>+ 3 +queueLabel.moc: $(srcdir)/queueLabel.h + $(MOC) $(srcdir)/queueLabel.h -o queueLabel.moc + +#>+ 2 +mocs: queueLabel.moc + +#>+ 3 popupMessage.moc: $(srcdir)/popupMessage.h $(MOC) $(srcdir)/popupMessage.h -o popupMessage.moc @@ -771,7 +778,7 @@ #>+ 3 clean-metasources: - -rm -f queueLabel.moc selectLabel.moc statusbar.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc + -rm -f selectLabel.moc statusbar.moc queueLabel.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc #>+ 2 KDE_DIST=statusbar.h statusBarBase.h Makefile.in timeLabel.h toggleLabel.h progressBar.h selectLabel.h overlayWidget.h queueLabel.h squeezedtextlabel.h popupMessage.h Makefile.am @@ -789,9 +796,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/statusbar/Makefile + $(AUTOMAKE) --foreign amarok/src/statusbar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/statusbar/Makefile.in @@ -818,7 +825,7 @@ #>+ 11 -libstatusbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/statusBarBase.cpp $(srcdir)/statusbar.cpp $(srcdir)/overlayWidget.cpp $(srcdir)/popupMessage.cpp $(srcdir)/progressBar.cpp $(srcdir)/squeezedtextlabel.cpp $(srcdir)/queueLabel.cpp statusbar.moc selectLabel.moc queueLabel.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc +libstatusbar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/statusBarBase.cpp $(srcdir)/statusbar.cpp $(srcdir)/overlayWidget.cpp $(srcdir)/popupMessage.cpp $(srcdir)/progressBar.cpp $(srcdir)/squeezedtextlabel.cpp $(srcdir)/queueLabel.cpp queueLabel.moc statusbar.moc selectLabel.moc popupMessage.moc squeezedtextlabel.moc statusBarBase.moc toggleLabel.moc @echo 'creating libstatusbar_la.all_cpp.cpp ...'; \ rm -f libstatusbar_la.all_cpp.files libstatusbar_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libstatusbar_la.all_cpp.final; \ --- amarok-1.4.3.orig/amarok/src/collectionscanner/Makefile.in +++ amarok-1.4.3/amarok/src/collectionscanner/Makefile.in @@ -147,6 +147,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -239,6 +240,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -287,6 +291,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -294,12 +299,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -322,8 +324,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -337,6 +342,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -369,18 +375,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -468,7 +477,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*) \ @@ -477,9 +486,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -489,9 +498,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile + $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/collectionscanner/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -506,9 +515,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -804,9 +813,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/collectionscanner/Makefile + $(AUTOMAKE) --foreign amarok/src/collectionscanner/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/collectionscanner/Makefile.in --- amarok-1.4.3.orig/amarok/src/amarokcore/Makefile.in +++ amarok-1.4.3/amarok/src/amarokcore/Makefile.in @@ -145,6 +145,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -237,6 +238,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -285,6 +289,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -292,12 +297,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -320,8 +322,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -335,6 +340,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -367,18 +373,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -469,7 +478,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*) \ @@ -478,9 +487,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -490,9 +499,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile + $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/amarokcore/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -507,9 +516,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -802,9 +811,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/amarokcore/Makefile + $(AUTOMAKE) --foreign amarok/src/amarokcore/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/amarokcore/Makefile.in --- amarok-1.4.3.orig/amarok/src/konquisidebar/Makefile.in +++ amarok-1.4.3/amarok/src/konquisidebar/Makefile.in @@ -155,6 +155,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -247,6 +248,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -295,6 +299,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -302,12 +307,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -330,8 +332,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -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_x11_FALSE = @include_x11_FALSE@ @@ -377,18 +383,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -460,7 +469,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*) \ @@ -469,9 +478,9 @@ #>- exit 1;; \ #>- esac; \ #>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile'; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile'; \ #>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile +#>- $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile #>+ 12 @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -481,9 +490,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile + $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/konquisidebar/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -498,9 +507,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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) @@ -874,9 +883,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu amarok/src/konquisidebar/Makefile + $(AUTOMAKE) --foreign amarok/src/konquisidebar/Makefile cd $(top_srcdir) && perl admin/am_edit amarok/src/konquisidebar/Makefile.in --- amarok-1.4.3.orig/amarok/Makefile.in +++ amarok-1.4.3/amarok/Makefile.in @@ -115,6 +115,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -207,6 +208,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -255,6 +259,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -262,12 +267,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -290,8 +292,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -305,6 +310,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -337,18 +343,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -420,7 +429,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*) \ @@ -458,9 +467,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--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: @@ -747,7 +756,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=COPYING-DOCS configure.in.bot Makefile.in VIS_PLAN HACKING amarok.kdevelop configure.in.in Makefile.am +KDE_DIST=COPYING-DOCS Makefile.in configure.in.bot VIS_PLAN HACKING amarok.kdevelop configure.in.in Makefile.am #>+ 2 docs-am: --- amarok-1.4.3.orig/debian/TODO +++ amarok-1.4.3/debian/TODO @@ -0,0 +1,2 @@ +- cdbs/kde.mk from svn.debian.org/pkg-kde sets DEB_INSTALL_DOCS_ALL to + empty. --- amarok-1.4.3.orig/debian/cdbs/kde.mk +++ amarok-1.4.3/debian/cdbs/kde.mk @@ -0,0 +1,154 @@ +# $Id: kde.mk 849 2005-03-18 18:42:10Z dato-guest $ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# 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. + + +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_kde +_cdbs_class_kde := 1 + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +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; \ + fi + touch debian/stamp-cvs-make + +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/kde3 +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el +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) + +common-build-arch common-build-indep:: debian/stamp-apidox +debian/stamp-apidox: + if test -n "$(DEB_KDE_APIDOX)"; then \ + $(DEB_MAKE_INVOKE) apidox; \ + fi + touch debian/stamp-apidox + +common-install-arch common-install-indep:: install-apidox +install-apidox:: + if test -n "$(DEB_KDE_APIDOX)"; then \ + $(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \ + fi + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + # Generate man pages for the programs + [ -d debian/man/out ] || mkdir -p debian/man/out + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + touch debian/stamp-man-pages + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + +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 + rm -f debian/stamp-apidox + rm -rf debian/shlibs-check + +# Workaround for Bug##296984 +clean:: reverse-patches + for dir in $(DEB_PATCHDIRS) ; do \ + rm -f $$dir/*.log ; \ + done + +cleanbuilddir:: + -if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi + +buildprep: clean apply-patches + make -f admin/Makefile.common dist + debian/rules clean + +clean:: + debian/rules reverse-config + +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 + +$(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 + + +endif --- amarok-1.4.3.orig/debian/control +++ amarok-1.4.3/debian/control @@ -0,0 +1,57 @@ +Source: amarok +Section: kde +Priority: optional +Maintainer: Adeodato Simó +Build-Depends: cdbs, debhelper (>=5), quilt, bzip2, libtool, + kdelibs4-dev, kdemultimedia-dev, kdebase-dev, + libhal-dev, libxine-dev, + libtag1-dev (>> 1.4), libsqlite3-dev, libtunepimp3-dev, + libmysqlclient15-dev, libpq-dev, + libsdl1.2-dev, libvisual-0.4-dev, + libifp-dev, libusb-dev, libgpod-dev, ruby, + ruby1.8-dev, automake1.9, libnjb-dev +Standards-Version: 3.7.2 + +Package: amarok +Architecture: any +Depends: amarok-xine, ruby, python-qt3, lsb-release, ${shlibs:Depends} +Recommends: kdemultimedia-kio-plugins +Suggests: libvisual-0.4-plugins, konqueror | www-browser, libqt0-ruby1.8, amarok-engines +Description: versatile and easy to use audio player for KDE + amaroK tries to be a little different, providing a simple drag and drop + interface that really makes playlist handling easy. + . + Features include: + - rapid playlist creation, with drag and drop from a directory view + - nice playlist browser for your existing playlists (PLS or M3U formats) + - collection-indexing support, for smart browsing and playlist creation + - possibility of accessing media via kioslaves, allowing you to play + via smb:// or fish:// (normal streams are of course supported) + - inline ID3 tag editing, capable of retrieving tags via MusicBrainz + - album cover support: automatically displays album covers from the + filesystem, or downloaded on the fly + - miscellaneous audio effects, including crossfading + - easy bindable global shortcuts, rich DCOP interface + - On-Screen Display (OSD), on track change or at keypress + - iPod and iRiver support + . + Support for XMMS and libvisual visualization plugins is also compiled in (you + need to have xmms or libvisual0.4-plugins installed to be able to use it). + +Package: amarok-engines +Architecture: any +Depends: amarok (= ${Source-Version}), amarok-xine +Description: output engines for the amaroK audio player + This package depends on all the available amaroK engines, and it's + installed by default unless you specify a particular engine. You can + safely remove it, as you can remove the amarok-$engine packages that + you don't use. + +Package: amarok-xine +Architecture: any +Depends: amarok (= ${Source-Version}), ${shlibs:Depends} +Provides: amarok-engine +Description: xine engine for the amaroK audio player + This package provides the xine engine for amaroK, which you may prefer + for some reason over the other engines (e.g., it is the lightest engine + Dependency-wise). --- amarok-1.4.3.orig/debian/amarok.install +++ amarok-1.4.3/debian/amarok.install @@ -0,0 +1,68 @@ +debian/tmp/usr/share/apps/amarok/* +debian/tmp/usr/share/apps/profiles/* +debian/tmp/usr/share/doc/* +debian/tmp/usr/share/icons/* +debian/tmp/usr/share/locale/* + +debian/tmp/usr/share/config.kcfg/amarok.kcfg +debian/tmp/usr/share/applications/kde/amarok.desktop +debian/tmp/usr/share/servicetypes/amarok_plugin.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/amarok_append.desktop + +debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.la +debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.so +debian/tmp/usr/share/services/amarok_void-engine_plugin.desktop + +debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.la +debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.so +debian/tmp/usr/share/apps/konqsidebartng/add/amarok.desktop +debian/tmp/usr/share/apps/konqsidebartng/entries/amarok.desktop +debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/amarok.desktop + +debian/tmp/usr/lib/kde3/libamarok_generic-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_generic-mediadevice.so +debian/tmp/usr/share/services/amarok_generic-mediadevice.desktop + +debian/tmp/usr/lib/kde3/libamarok_ifp-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_ifp-mediadevice.so +debian/tmp/usr/share/services/amarok_ifp-mediadevice.desktop + +debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.so +debian/tmp/usr/share/services/amarok_ipod-mediadevice.desktop + +debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.la +debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.so +debian/tmp/usr/share/services/amarok_daap-mediadevice.desktop + +debian/tmp/usr/lib/libamarok.* + +debian/tmp/usr/share/servicetypes/amarok_codecinstall.desktop +debian/tmp/usr/share/services/amaroklastfm.protocol +debian/tmp/usr/bin/amarok_proxy.rb + +debian/tmp/usr/bin/amarok +debian/tmp/usr/bin/amarokapp /usr/bin +debian/tmp/usr/bin/amarokcollectionscanner /usr/lib/amarok +debian/tmp/usr/bin/amarok_libvisual /usr/lib/amarok + +debian/tmp/etc/* + +debian/icons/* /usr/share/pixmaps + +debian/install-mp3 /usr/lib/amarok + +amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services + +debian/tmp/usr/share/services/amarokitpc.protocol +debian/tmp/usr/share/services/amarokpcast.protocol +debian/tmp/usr/share/services/amarok_massstorage-device.desktop +debian/tmp/usr/share/services/amarok_nfs-device.desktop +debian/tmp/usr/share/services/amarok_smb-device.desktop +debian/tmp/usr/bin/amarok_daapserver.rb +debian/tmp/usr/lib/kde3/libamarok_massstorage-device.so +debian/tmp/usr/lib/kde3/libamarok_massstorage-device.la +debian/tmp/usr/lib/kde3/libamarok_nfs-device.so +debian/tmp/usr/lib/kde3/libamarok_nfs-device.la +debian/tmp/usr/lib/kde3/libamarok_smb-device.so +debian/tmp/usr/lib/kde3/libamarok_smb-device.la --- amarok-1.4.3.orig/debian/install-mp3 +++ amarok-1.4.3/debian/install-mp3 @@ -0,0 +1,72 @@ +check_mp3() { + if [ $? -eq 0 ]; then + if [ -x /usr/bin/kdialog ]; then + kdialog --msgbox "MP3 support now installed, you will need to restart Amarok." + elif [ -x /usr/bin/zenity ]; then + zenity --info --text "MP3 support now installed, you will need to restart Amarok." + else + Xdialog --msgbox "MP3 support now installed, you will need to restart Amarok." 5 60 + fi + exit 0 + else + if [ -x /usr/bin/kdialog ]; then + kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine-extracodecs\" manually." + elif [ -x /usr/bin/zenity ]; then + zenity --info --text "There was an error installing MP3 support. You need to install the package \"libxine-extracodecs\" manually." + else + Xdialog --msgbox "There was an error installing MP3 support.\nYou need to install the package \"libxine-extracodecs\" manually." 10 60 + fi + exit 1 + fi +} + +AVAILABLE=`apt-cache show libxine-extracodecs | grep Package` +INSTALLED=`dpkg --get-selections libxine-extracodecs | grep install` +RELEASE=`lsb_release -sc` + +if [ -n "$AVAILABLE" ] && [ -z "$INSTALLED" ]; then + if [ -x /usr/bin/kdesu ] && [ -x /usr/bin/adept_batch ]; then + kdesu -d "bash -c 'echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE multiverse >> /etc/apt/sources.list && apt-get update && adept_batch install libxine-extracodecs'" + elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then + gksudo "bash -c 'echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE multiverse >> /etc/apt/sources.list && apt-get update && echo libxine-extracodecs i | synaptic --set-selections --non-interactive'" + else + echo -e '#! /bin/sh\necho "deb http://archive.ubuntu.com/ubuntu/ $RELEASE multiverse" >> /etc/apt/sources.list' > /tmp/sources_list.sh + chmod +x /tmp/sources_list.sh + xterm -e 'sudo /tmp/sources_list.sh && sudo apt-get update && sudo apt-get install libxine-extracodecs' + rm -f /tmp/sources_list.sh + fi + check_mp3 +elif [ -z "$AVAILABLE" ] && [ -z "$INSTALLED" ]; then + if [ -x /usr/bin/kdialog ]; then + kdialog --yesno "Do you want to enable restricted software from multiverse?" + elif [ -x /usr/bin/zenity ]; then + zenity --question --text "Do you want to enable restricted software from multiverse?" + else + Xdialog --yesno "Do you want to enable restricted software from multiverse?" 7 60 + fi + + if [ $? -eq 0 ]; then + if [ -x /usr/bin/kdesu ] && [ -x /usr/bin/adept_batch ]; then + kdesu -d "bash -c 'echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE multiverse >> /etc/apt/sources.list && apt-get update && adept_batch install libxine-extracodecs'" + elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then + gksudo "bash -c 'echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE multiverse >> /etc/apt/sources.list && apt-get update && echo libxine-extracodecs i | synaptic --set-selections --non-interactive'" + else + echo -e '#! /bin/sh\necho "deb http://archive.ubuntu.com/ubuntu/ $RELEASE multiverse" >> /etc/apt/sources.list' > /tmp/sources_list.sh + chmod +x /tmp/sources_list.sh + xterm -e 'sudo /tmp/sources_list.sh && sudo apt-get update && sudo apt-get install libxine-extracodecs' + rm -f /tmp/sources_list.sh + fi + else + if [ -x /usr/bin/kdialog ]; then + kdialog --msgbox "There was an error installing MP3 support." + elif [ -x /usr/bin/zenity ]; then + zenity --error --text "There was an error installing MP3 support." + else + Xdialog --msgbox "There was an error installing MP3 support." 5 50 + fi + exit 1 + fi + check_mp3 +fi + +exit 0 --- amarok-1.4.3.orig/debian/amarok.manpages +++ amarok-1.4.3/debian/amarok.manpages @@ -0,0 +1 @@ +debian/amarok.1 --- amarok-1.4.3.orig/debian/icons/amarok-16.xpm +++ amarok-1.4.3/debian/icons/amarok-16.xpm @@ -0,0 +1,210 @@ +/* XPM */ +static char *amarok-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 188 2", +" c black", +". c #010203", +"X c #010304", +"o c #030405", +"O c #030406", +"+ c #05070A", +"@ c #03080C", +"# c #05090D", +"$ c #04090F", +"% c #050A10", +"& c #070F17", +"* c #071019", +"= c #0A1521", +"- c #0B1825", +"; c #0D1824", +": c #0D1926", +"> c #0F1A26", +", c #0F1E2C", +"< c #0E1F30", +"1 c #101D2A", +"2 c #0F2133", +"3 c #102030", +"4 c #132436", +"5 c #132639", +"6 c #142638", +"7 c #17293B", +"8 c #14283C", +"9 c #152A40", +"0 c #193047", +"q c #193149", +"w c #19324B", +"e c #203A55", +"r c #223D59", +"t c #26415E", +"y c #234562", +"u c #22456C", +"i c #23486F", +"p c #26486E", +"a c #284360", +"s c #294663", +"d c #244A71", +"f c #264F7A", +"g c #294A70", +"h c #2A4B71", +"j c #2D4D73", +"k c #29537B", +"l c #2D5178", +"z c #304F74", +"x c #35506D", +"c c #325176", +"v c #325277", +"b c #335377", +"n c #355377", +"m c #365575", +"M c #37567A", +"N c #32597F", +"B c #33587E", +"V c #375A7F", +"C c #385472", +"Z c #395572", +"A c #3A5675", +"S c #38567A", +"D c #3B5876", +"F c #3A597A", +"G c #3B587A", +"H c #3B5A7B", +"J c #3B587C", +"K c #405C7F", +"L c #445E7F", +"P c #46607E", +"I c #2B5781", +"U c #385C82", +"Y c #376088", +"T c #37628A", +"R c #3A688F", +"E c #3E6A90", +"W c #3F6B92", +"Q c #415D80", +"! c #435E81", +"~ c #445F80", +"^ c #445F82", +"/ c #466686", +"( c #476687", +") c #4A6486", +"_ c #4E6989", +"` c #4F6E8F", +"' c #42769E", +"] c #46769D", +"[ c #50698A", +"{ c #506A89", +"} c #516A89", +"| c #506F8F", +" . c #546D8C", +".. c #556E8E", +"X. c #5B7088", +"o. c #5B718A", +"O. c #587591", +"+. c #5B7491", +"@. c #5E7B9A", +"#. c #487BA2", +"$. c #6F7D8C", +"%. c #607790", +"&. c #637B97", +"*. c #627E9B", +"=. c #6B7D90", +"-. c #4980A8", +";. c #4A83AA", +":. c #5491B8", +">. c #5693B9", +",. c #5E99BE", +"<. c #658DAC", +"1. c #6A87A0", +"2. c #6A87A4", +"3. c #6D89A7", +"4. c #758BA2", +"5. c #758FA9", +"6. c #7E8FA1", +"7. c #7F93A7", +"8. c #7997AC", +"9. c #63A5CA", +"0. c #6CA7CA", +"q. c #6CA8CB", +"w. c #8B949E", +"e. c #8093A7", +"r. c #8594A4", +"t. c #8395A8", +"y. c #8D99A6", +"u. c #8F9DAB", +"i. c #93A0AD", +"p. c #9AA0A8", +"a. c #9EA7B1", +"s. c #A5A6A7", +"d. c #A3ACB7", +"f. c #A9AFB7", +"g. c #A5B2BF", +"h. c #B0B1B2", +"j. c #B2B2B2", +"k. c gray70", +"l. c #B1B3B6", +"z. c #B4B5B6", +"x. c #B6B6B6", +"c. c #BBBBBB", +"v. c #B8BBBE", +"b. c #BCBCBC", +"n. c #BDBEBF", +"m. c gray75", +"M. c #A8B8C9", +"N. c #B9BDC2", +"B. c #BABEC3", +"V. c #93C1D9", +"C. c #9BC7DD", +"Z. c #BFC5CB", +"A. c #B9C4D0", +"S. c #C1C1C1", +"D. c #C3C3C3", +"F. c #C6C6C6", +"G. c gray78", +"H. c #C5C8CB", +"J. c gray79", +"K. c #CACACA", +"L. c #CBCBCB", +"P. c gray80", +"I. c #CDCDCD", +"U. c #CECECE", +"Y. c gray81", +"T. c #C1C8D0", +"R. c #D0D0D0", +"E. c gray82", +"W. c #D1D1D2", +"Q. c #D2D2D2", +"!. c LightGray", +"~. c gray83", +"^. c #D5D5D5", +"/. c #D7D7D7", +"(. c #DADADA", +"). c gray86", +"_. c gainsboro", +"`. c gray87", +"'. c #CFD8E1", +"]. c #D0D9E1", +"[. c #E4E4E4", +"{. c gray90", +"}. c gray91", +"|. c gray92", +" X c #EAEDF1", +".X c gray94", +"XX c gray97", +"oX c None", +/* pixels */ +"oXoXoXoXX 6 a D Z r 1 oXoXoXoX", +"oXoXoX2 | i.n.D.n.l.t.F * oXoXoX", +"oXoXw e.G.).).~.Q.L.D.z.*.- oXoX", +"oX< 7.K._.(.(.~.Q.P.f.y.c.@.% oX", +"X ` b._.(./.~.~.Q.r. .L b.v.s ", +"4 u.L./.~.~.Q.H.+.! .$.z.G.5.# ", +"t k.Y.Q.Q.d._ +.c _ ~ s.B.P.g.3 ", +"Z k.P.B.6.n A.&.L ) z F o.G.H.9 ", +"x j.d._ h b _ J K ~ ! w.D.~.T.8 ", +"e X.j S h p c M J c p.).{.{.M.: ", +"> 4.D u u l N U J H R..X.X|.3.O ", +" C =.d I T E E T O.`.XXXX].w ", +"oX& f k E ] -.;.#.1.[.XX X/ oX", +"oXoX= I ' >.q.9.,.8.{.]./ @ oX", +"oXoXoX# y :.V.C.0.<.2.w X oXoX", +"oXoXoXoX + , 7 4 ; O oXoXoXoX" +}; --- amarok-1.4.3.orig/debian/icons/amarok.xpm +++ amarok-1.4.3/debian/icons/amarok.xpm @@ -0,0 +1,220 @@ +/* XPM */ +static char *amarok[] = { +/* columns rows colors chars-per-pixel */ +"32 32 182 2", +" c #000000", +". c #020508", +"X c #03090E", +"o c #0E0E0E", +"O c #050A10", +"+ c #09131E", +"@ c #101112", +"# c #14191F", +"$ c #0A1622", +"% c #0B1926", +"& c #0D1C2C", +"* c #0E1F30", +"= c #161E26", +"- c #0F2032", +"; c #18222D", +": c #102336", +"> c #12273C", +", c #1A2632", +"< c #1C2B3B", +"1 c #142C44", +"2 c #162F48", +"3 c #16304A", +"4 c #18324E", +"5 c #183450", +"6 c #1B3A5A", +"7 c #20344A", +"8 c #223A52", +"9 c #1E4064", +"0 c #22456B", +"q c #23486E", +"w c #28496F", +"e c #244A72", +"r c #244D78", +"t c #2B4C72", +"y c #26517E", +"u c #2C5077", +"i c #2B537B", +"p c #325175", +"a c #355479", +"s c #33587E", +"d c #395575", +"f c #38567A", +"g c #3B597C", +"h c #405C7D", +"j c #49627D", +"k c #52677E", +"l c #275280", +"z c #285685", +"x c #295788", +"c c #2D5982", +"v c #2A598A", +"b c #2C5D91", +"n c #355C83", +"m c #395E83", +"M c #2E6094", +"N c #336189", +"B c #3A658C", +"V c #336395", +"C c #356892", +"Z c #386798", +"A c #3C6C93", +"S c #3C6A9A", +"D c #3D729A", +"F c #425D80", +"G c #456083", +"H c #41678D", +"J c #496485", +"K c #4C6688", +"L c #4F6889", +"P c #466E93", +"I c #426E9B", +"U c #417096", +"Y c #42739B", +"T c #47789F", +"R c #4B749C", +"E c #506782", +"W c #536A84", +"Q c #536C8B", +"! c #586C82", +"~ c #5D7084", +"^ c #5D748D", +"/ c #51769D", +"( c #55799E", +") c #5A7190", +"_ c #447AA1", +"` c #457CA8", +"' c #4F78A2", +"] c #5C7EA1", +"[ c #627B96", +"{ c #6A7F96", +"} c #4681AB", +"| c #4984AB", +" . c #4E8BB2", +".. c #5082A7", +"X. c #5084AA", +"o. c #5E80A4", +"O. c #5B81A9", +"+. c #548CB2", +"@. c #5390B6", +"#. c #5594BD", +"$. c #5B94BC", +"%. c #5E99BE", +"&. c #6C8197", +"*. c #69809B", +"=. c #758699", +"-. c #778A9D", +";. c #7C8691", +":. c #798A9D", +">. c #6080A2", +",. c #6A86A3", +"<. c #6E8CAB", +"1. c #608FB2", +"2. c #7389A3", +"3. c #7B91A6", +"4. c #7B9AB9", +"5. c #579AC1", +"6. c #5B9EC5", +"7. c #669EC2", +"8. c #68A8CC", +"9. c #6AACD0", +"0. c #72ABCD", +"q. c #78AFCE", +"w. c #71B0D2", +"e. c #7BB4D4", +"r. c #858F9B", +"t. c #87909A", +"y. c #8D949B", +"u. c #94989C", +"i. c #9D9D9D", +"p. c #8493A3", +"a. c #8395A8", +"s. c #8798A9", +"d. c #859FB9", +"f. c #9199A3", +"g. c #8EA2B7", +"h. c #8CA5BF", +"j. c #96A2AB", +"k. c #9BA4AD", +"l. c #9DA9B5", +"z. c #A3A3A3", +"x. c #A6A9AC", +"c. c #ACACAC", +"v. c #A3ABB2", +"b. c #A4AEB8", +"n. c #AAAEB1", +"m. c #ADB0B3", +"M. c #ADB4BB", +"N. c #B3B3B3", +"B. c #B0B7BE", +"V. c #B6B8B9", +"C. c #BBBBBB", +"Z. c #8FA7C1", +"A. c #87B6D1", +"S. c #85BBD7", +"D. c #A2B1C1", +"F. c #AFBBC7", +"G. c #ADBAC8", +"H. c #B2BCC7", +"J. c #B0BCCA", +"K. c #B8BDC3", +"L. c #93C2DA", +"P. c #9EC9DE", +"I. c #BFC3C7", +"U. c #B0C1D3", +"Y. c #AFD1E1", +"T. c #B4D6E4", +"R. c #C3C3C4", +"E. c #C1C4C8", +"W. c #CCCCCC", +"Q. c #C1CEDC", +"!. c #CFD4D9", +"~. c #D3D3D3", +"^. c #D6DADE", +"/. c #DBDBDB", +"(. c #DAE0E6", +"). c #E2E3E3", +"_. c #E2E5E8", +"`. c #ECECEC", +"'. c #EAEEF1", +"]. c #F4F4F4", +"[. c #FBFBFB", +"{. c None", +/* pixels */ +"{.{.{.{.{.{.{.{.{.{.{.o # , 7 8 8 < ; @ o {.{.{.{.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.{.{.X 4 l M I / ( ( R Z v 9 * {.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.X 6 M ( s.n.N.N.N.N.N.N.k.,.S r & {.{.{.{.{.{.{.", +"{.{.{.{.{.{.- v ( k.N.C.W.W.~.~.W.R.R.V.N.N.3.Z 6 . {.{.{.{.{.", +"{.{.{.{. 3 V a.N.C.~.)./././.~.~.~.W.W.R.V.N.n./ r X {.{.{.{.", +"{.{.{.{.2 Z j.N.W./././././.~.~.~.W.W.W.W.R.K.N.N.o.y . {.{.{.", +"{.{.{.& V j.N.W.).)././.~.~.~.~.~.W.W.W.W.R.n.R.C.V.] q {.{.", +"{.{.. v a.N.R.)././././.~./.~.~.W.~.W.W.R.E q n.R.C.V.I 1 {.{.", +"{.{.6 ( N.C././././.~.~.~.~.~.~.W.~.~.b.j ^ p j R.C.C.v.v X {.", +"{.X b k.N.W././././.~./.~.~.~.~.~.W.:.e Q ) K k x.R.R.R.o.5 {.", +"{.4 ' N.V././.~.~./.~.~.~.~.~.~.E.J p F ) ) p y.i.R.R.R.b.v . ", +"o r s.N.R./.~.~.~.~.~.~.~.W.I.B.h d s Q Q K ! z.c.W.W.R.R.I % ", +"@ M n.N.W.~.~.~.~.~.~.E.Q g g f p w L Q Q t u.z.W.W.W.W.W.<.4 . ", +", S N.N.W.~.~.~.~.~.K.h G &.D.Q 0 F K L j j z.C.l.M.~.W.W.g.0 . ", +"< / N.N.W.W.W.W.W.M.f h [ [.'.a g K G L p 0 d g w &.~.~.~.M.0 . ", +"8 ( N.N.W.W.W.p.Q w p w (.F.f f F F G K g a g d j t.c.!.~.K.i . ", +"7 ( N.N.R.R.{ 2.F 0 0 Q H.e g g F F F F G g g u.c.n.C././.H.r . ", +", I N.m.f.^ h 0 0 0 0 d t a f g g F F F p ! c.N.W./.)././.D.q ", +"= V y.h f t d m p 0 0 q p p d a g g F p ! N.C.).).).).).).d.6 ", +"o x :.t w t a d t 0 q t p a d s f f a 0 c.C.).`.`.`.).).).] , . ", +"o 8 ,.r.q 0 q 0 0 q t u p s s g m f e g V./.`.`.`.`.`._.^.M X . ", +"{.% Z m.;.q 0 0 q e i i s N h N m s r ^ C.`.].].].].`.`.Z.9 . ", +"{. r 2.N.! q q t n c m N B B B B c s =.R.].].].].].]._.S $ {.", +"{.. $ Z =.q q u m c H B A U U U B B n p.~.].].[.[.[.].4.9 {.", +"{.{. 6 z q r i c P U Y Y T _ _ D Y N j.~.].[.[.[.].U.v X {.{.", +"{.{.{.. e y r c A Y T ..| @. . .| ..D l./.`.].].[.Q.V % {.{.", +"{.{.{. . e c N A D @.@.8.6.6.%.%.+.T n./.`.].].J.Z * {.{.{.", +"{.{.{.{. . 9 M D X.@.6.q.w.w.8.8.%.| N./.`.(.4.v % {.{.{.{.", +"{.{.{.{.{. > N } #.9.S.L.L.S.w.0.@.c.~.h.S 9 X {.{.{.{.{.", +"{.{.{.{.{.{. X 2 C $.A.Y.T.P.q.#.` ' b 0 + {.{.{.{.{.{.", +"{.{.{.{.{.{.{.{. # < 9 p w w 0 5 - . {.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.{.{.{. . . . . . . . . {.{.{.{.{.{.{.{.{.{." +}; --- amarok-1.4.3.orig/debian/rules +++ amarok-1.4.3/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f + +### CDBS INCLUDES +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/kde.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +### VARIABLES +DEB_KDE_CVS_MAKE := yes + +DEB_DH_MAKESHLIBS_ARGS_ALL := -n +DEB_INSTALL_DIRS_amarok := usr/lib/amarok +DEB_DH_SHLIBDEPS_ARGS := -Xusr/lib/amarok/amarok_xmmswrapper2 \ + -Xusr/lib/kde3/konqsidebar_universalamarok.so + +DEB_CONFIGURE_EXTRA_FLAGS := --with-included-sqlite \ + --without-akode \ + --without-gstreamer10 \ + --with-ifp \ + --with-libgpod \ + --without-exscalibar \ + --enable-mysql \ + --enable-postgresql \ + --without-xmms \ + --with-libvisual \ + --with-libnjb \ + +# See debian/TODO +DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done)) + +### + +### Libtool and Automake updates +post-patches:: debian/stamp-autothings-update +debian/stamp-autothings-update: + cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in + cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh + for f in /usr/share/automake-1.9/*; do \ + if test -f $$f && \ + test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \ + cp -f $$f $(DEB_SRCDIR)/admin; \ + fi; \ + done + touch $@ + +clean:: + rm -f debian/stamp-autothings-update + +### POST-INSTALL HACKING +# Make directories in /usr/share/doc be symlinks for packages other than amarok +common-binary-post-install-arch:: + for p in $(filter-out amarok,$(DEB_ALL_PACKAGES)); do \ + rm -rf debian/$$p/usr/share/doc/$$p; \ + ln -sf amarok debian/$$p/usr/share/doc/$$p; \ + done + + # Check for not installed files + dh_install --no-act --list-missing + chmod a+x debian/amarok/usr/lib/amarok/install-mp3 + ln -s /usr/bin/amarokapp debian/amarok/usr/lib/amarok/amarokapp --- amarok-1.4.3.orig/debian/overrides/amarok-arts +++ amarok-1.4.3/debian/overrides/amarok-arts @@ -0,0 +1 @@ +amarok-arts: no-shlibs-control-file usr/lib/libamarokarts.so --- amarok-1.4.3.orig/debian/changelog +++ amarok-1.4.3/debian/changelog @@ -0,0 +1,914 @@ +amarok (2:1.4.3-0ubuntu6) edgy; urgency=low + + * Added support for edgy ( and future TBA releases ) to install-mp3 + * Closes Malone #60637 + + -- Brandon Holtsclaw Sat, 16 Sep 2006 03:56:07 -0500 + +amarok (2:1.4.3-0ubuntu5) edgy; urgency=low + + * Fixed a typo that prevented Amarok configuring Nomad Jukebox + in debian/rules + + -- Brandon Holtsclaw Sat, 16 Sep 2006 01:48:11 -0500 + +amarok (2:1.4.3-0ubuntu4) edgy; urgency=low + + * Built --with-libnjb support ( Creative Nomad Devices ) + * Added kubuntu_05_playlist_encoding.diff. This bug could result + in failure to restore the current playlist. (BR 133613) + + -- Brandon Holtsclaw Fri, 15 Sep 2006 10:53:56 -0500 + +amarok (2:1.4.3-0ubuntu3) edgy; urgency=low + + * Fixed little error in install-mp3, in the case multiverse is + already activated. Code could be really optimized, but it works + as it is. I will probably make something clean after edgy release. + + -- Anthony Mercatante Tue, 13 Sep 2006 22:26:14 +0200 + +amarok (2:1.4.3-0ubuntu2) edgy; urgency=low + + * Improved install-mp3 to manage ubuntu/gnome and other desktops correctly. + (closes #59007) + + -- Anthony Mercatante Mon, 11 Sep 2006 17:02:14 +0200 + +amarok (2:1.4.3-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * Removed kubuntu_0{5,6,7,8}_*.diff patches as they have been applyed upstream + * Added build-dep ruby1.8-dev and automake-1.9 as now required to build amarok + + [ Jonathan Riddell ] + * Remove automake1.7 build-dep + * Install all files + + -- Brandon Holtsclaw Mon, 4 Sep 2006 22:08:14 -0500 + +amarok (2:1.4.2-0ubuntu3) edgy; urgency=low + + [ Jonathan Riddell ] + * Remove kubuntu_03_podir.diff, not built with tar in .orig + + [ Sarah Hobbs ] + * Added a more verbose error message when install-mp3 script fails + + [ Brandon Holtsclaw ] + * Collection scanner would only restart a maximum of 2 times instead of + 20. (fixed in SVN revision 578922) - kubuntu_08_scanner.diff + * MTP mediadevice support would not compile against libmtp versions gt + 0.0.12. (fixed in SVN revision 576121) - kubuntu_06_mtp.diff + * AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015) + - kubuntu_05_audiocd.diff + * Fixed bug which prevented Amarok from creating the collection database + in rare circumstances using SQLite. (BR 133072) - kubuntu_07_collection.diff + + -- Brandon Holtsclaw Thu, 31 Aug 2006 12:01:16 -0500 + +amarok (2:1.4.2-0ubuntu2) edgy; urgency=low + + * amarok_libvisual helper added to amarok.install (malone #57636) + * Fixed typo in Sugests for libvisual-0.4-plugins Closes Last Half malone #55779 + + -- Brandon Holtsclaw Sun, 27 Aug 2006 05:52:34 -0500 + +amarok (2:1.4.2-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * Removed libgstreamer0.10-dev as its not needed anylonger + gst support has been droped upstream and in kubuntu + * Added libhal-dev as a build dep (malone #55779) + + [ Daniel Molkentin ] + * Install DAAP media device + + [ Sarah Hobbs ] + * New upstream version. Closes #24063, #49098, #47179, #52958 and other bugs + * Moved python-qt3 from recommends to depends. Closes bugs #55075, #48724 + * Removed python from suggests (already a dep of python-qt3) + * Changed suggests libvisual-0.2 to libvisual0.4.0-plugins. Closes bug #55734 + * Compiled with libvisual support. Added build-dep libvisual-0.4-dev. Closes other half of bug #55734 + * Removed debian/amarok-gstreamer.install as we no longer distribute + amarok-gstreamer + * Change build-dep automake1.9 --> automake1.7 + * Changed build-dep debhelper --> debhelper (>=5) + * Bumped Compat to 5 + + -- Brandon Holtsclaw Wed, 23 Aug 2006 07:11:02 -0500 + +amarok (2:1.4.1-0ubuntu3) edgy; urgency=low + + * Make debian/install-mp3 executable. Closes bug #52994 + * Install amarokapp in /usr/bin. Closes bugs #16474, #52360 + * Stopped compiling with exscalibar support - upstream + removed the moodbar + + -- Sarah Hobbs Tue, 18 Jul 2006 13:55:53 +1000 + +amarok (2:1.4.1-0ubuntu2) edgy; urgency=low + + * Depend on amarok-xine not amarok-engines + + -- Jonathan Riddell Wed, 12 Jul 2006 00:01:33 +0000 + +amarok (2:1.4.1-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Jonathan Riddell Tue, 4 Jul 2006 22:46:21 +0000 + +amarok (1.4.0a-1) unstable; urgency=low + + * Revised tarball for 1.4.0 (closes: #367897), fixing the following issues: + + + does not botch migration from 1.3 SQLite collections, which in addition + caused further collection rebuilds to appear empty. (Closes: #368396) + + correctly closes database connections, thus not failing with "too many + open files" and deleting the collection after some hours in pause mode. + (Closes: #368086) + + audio CDs can be reproduced again. (Upstream #127388) + + * Switch to included SQLite; for some reason, dynamic linking against 3.3.5 + makes scores unfunctional. (Closes: #367468) + + -- Adeodato Simó Sat, 27 May 2006 15:23:14 +0200 + +amarok (1.4.0-1) unstable; urgency=low + + * New upstream release. The upstream tarball no longer ships the GStreamer + engine, and aRts support was dropped a while ago, and this upload only + includes the XINE engine. + + Bugs reported in the Debian BTS fixed in this version: + + + collection is updated at start up. (Closes: #330017) + + metadata for icecast streams is displayed. (Closes: #349796) + + the correct charset is used for lyrics URLs. (Closes: #352882) + + iPods are recognized even after emptying them. (Closes: #350305) + + non-ascii characters are displayed correctly under non UTF-8 + locales in the konqueror sidebar. (Closes: #353058) + + last.fm submission queue is flushed after network unavailability + even if no more tracks are played. (Closes: #344429) + + Regressions fixed since the latest beta: + + + iPod model detection works again, without needing libgpod-cvs. + (Closes: #364789) + + filling tags using MusicBrainz works again. (Closes: #364798) + + * Enable Moodbar support, now that Exscalibar has entered unstable. + (Closes: #364588) + + * Update Standards-Version to 3.7.2 (no changes required). + + -- Adeodato Simó Sun, 14 May 2006 16:42:14 -0500 + +amarok (1.4-beta3c-1) experimental; urgency=low + + * Third beta for the upcoming 1.4 version packaged. + + * Build against libtunepimp3-dev. + + -- Adeodato Simó Sat, 15 Apr 2006 19:47:54 +0200 + +amarok (1.4-beta2-3) experimental; urgency=low + + * Rebuild against libmysqlclient15off. (Closes: #358490) + + -- Adeodato Simó Thu, 23 Mar 2006 02:18:56 +0100 + +amarok (1.4-beta2-2) experimental; urgency=low + + * Fix yesterday's brainfart: aKode can't output to aRts, so remove this + statement from the description. + + * In addition, and after a bit of chit-chat with upstream, follow their + wishes and not package aKode at all (bye amarok-arts), and don't include + GStreamer 0.10 support for now. + + -- Adeodato Simó Mon, 6 Mar 2006 23:37:43 +0100 + +amarok (1.4-beta2-1) experimental; urgency=low + + * Second beta for the upcoming 1.4 version packaged. + + This release drops the aRts engine; in order to keep support for + outputting to aRts, ship the aKode engine in the amarok-arts package. + + Also, GStreamer 0.8 support is dropped in favour of GStreamer 0.10. Update + build-dependencies and amarok-gstreamer's dependencies accordingly. + + * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0] + is overwritten correctly. This closes: #352171 (amaroK not remembering the + desktop it was on upon login), and incidentally makes Erich Schubert happy. + + * Drop build-dependency on libgtk2.0-dev now that #353590 is fixed. + + -- Adeodato Simó Mon, 6 Mar 2006 05:44:33 +0100 + +amarok (1.4-beta1-r511476b) experimental; urgency=low + + * First beta (plus SVN) for the upcoming 1.4 version packaged. + (Closes: #352590) + + * Update build-depends to support iRiver iFP (B-D: libifp-dev, libusb-dev), + and iPod via libgpod (B-D: libgpod-dev; plus libgtk2.0-dev due to #353590). + + * Since lyrics downloading is now implemented in a separate Ruby script, + promote ruby from Suggests to Recommends, so that functionality is ideally + not lost. Add a note with this information to README.Debian. + + * Link against sqlite dynamically again, since amaroK 1.4 can cope with the + restriction explained in the changelog entry for 1.3.1-1 and Bug#326648. + + -- Adeodato Simó Mon, 20 Feb 2006 05:42:15 +0100 + +amarok (1.3.9-1) unstable; urgency=medium + + * New upstream bugfix release. + + * Build against libtunepimp3-dev. (Closes: #359086) + + -- Adeodato Simó Thu, 27 Apr 2006 00:33:29 +0200 + +amarok (1.3.8-1) unstable; urgency=low + + * New upstream bugfix release: + + + fetching lyrics works again. (Closes: #344509) + + * Do not use g++-3.4 in arm, m68k and hppa anymore, sid's g++-4.0 is + expected to work. (Closes: #342953) + + * Update MySQL build-dependency to libmysqlclient15-dev. (Closes: #343759) + + * Switch patch management to quilt, and make use of patchsys-quilt.mk. + + * Drop build-depends version constraints that are satisfied with stable. + Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were + transient and all arches have the minimum required versions in sid now. + + -- Adeodato Simó Wed, 18 Jan 2006 01:43:40 +0100 + +amarok (1.3.7-1) unstable; urgency=low + + * New upstream bugfix release. + + * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959) + Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev. + + * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in + testing and unstable, and I'll be using a backport for sarge packages. + Bump version constraint in debian/control. + + * Again, update my e-mail address in debian/control, yada yada. + + -- Adeodato Simó Wed, 07 Dec 2005 06:44:59 +0100 + +amarok (2:1.3.9-0ubuntu4) dapper; urgency=low + + * debian/cdbs/kde.mk: + - added dh_iconcache. + + -- Daniel Holbach Sun, 21 May 2006 16:16:47 +0200 + +amarok (2:1.3.9-0ubuntu3) dapper; urgency=low + + * Don't install hr translations, it's really Hindi + Closes Malone #44517 + + -- Jonathan Riddell Tue, 16 May 2006 00:14:56 +0300 + +amarok (2:1.3.9-0ubuntu2) dapper; urgency=low + + * Rebuild against the new libmysqlclient15off with correct symbols. + + -- Adam Conrad Thu, 6 Apr 2006 12:46:44 +1000 + +amarok (2:1.3.9-0ubuntu1) dapper; urgency=low + + * New upstream release + * Use automake1.7, that's what the upstream file seems to use + + -- Jonathan Riddell Sat, 25 Mar 2006 17:32:01 +0000 + +amarok (2:1.3.8-0ubuntu7) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell Wed, 15 Mar 2006 18:49:41 +0000 + +amarok (2:1.3.8-0ubuntu6) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell Thu, 23 Feb 2006 12:28:47 +0000 + +amarok (2:1.3.8-0ubuntu5) dapper; urgency=low + + * Add kubuntu_03_podir.diff, change podir so .pot file gets + generated in a place that keeps the language pack scripts happy + + -- Jonathan Riddell Mon, 20 Feb 2006 19:09:30 +0000 + +amarok (2:1.3.8-0ubuntu4) dapper; urgency=low + + * Remove amarok-gstreamer from enginePackages substvars + + -- Jonathan Riddell Mon, 20 Feb 2006 11:44:19 +0000 + +amarok (2:1.3.8-0ubuntu3) dapper; urgency=low + + * Remove use of GCC 3.4 + + -- Jonathan Riddell Thu, 16 Feb 2006 10:52:51 +0000 + +amarok (2:1.3.8-0ubuntu2) dapper; urgency=low + + * Remove GStreamer 0.8 support, default to xine + * Change from libmysqlclient14-dev to libmysqlclient15-dev build-dep + + -- Jonathan Riddell Wed, 1 Feb 2006 11:56:01 +0000 + +amarok (2:1.3.8-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell Sun, 15 Jan 2006 19:10:14 +0000 + +amarok (2:1.3.7-0ubuntu4) dapper; urgency=low + + * weaken build dependencies + + -- Reinhard Tartler Fri, 30 Dec 2005 14:55:13 +0100 + +amarok (2:1.3.7-0ubuntu3) dapper; urgency=low + + * Add kubuntu_02_read_kubuntu_config.diff to make it read Kubuntu's + amarokrc file, which hides the splash screen + + -- Jonathan Riddell Thu, 15 Dec 2005 20:13:28 +0000 + +amarok (2:1.3.7-0ubuntu2) dapper; urgency=low + + * debian/control: Removed the text about libvisual. There is no libvisual + support right now in ubuntu + + -- Stephan Hermann Wed, 7 Dec 2005 23:52:58 +0100 + +amarok (2:1.3.7-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell Tue, 6 Dec 2005 20:59:31 +0000 + +amarok (2:1.3.6-1ubuntu3) dapper; urgency=low + + * Make amarok-gstreamer default engine + * Add kubuntu_01_kdepot.diff for pot generation + + -- Jonathan Riddell Tue, 29 Nov 2005 19:18:38 +0000 + +amarok (2:1.3.6-1ubuntu2) dapper; urgency=low + + * debian/substvars: moved gstreamer0.8-mad to Suggests section + * Update kde.mk for .pot generation + + -- Jonathan Riddell Sat, 26 Nov 2005 02:52:27 +0000 + +amarok (2:1.3.6-1ubuntu1) dapper; urgency=low + + * Sync with debian, and readded the Ubuntu specific Epoch + * Merged the debian/changelog + * debian/control: + - Removed libvisual-dev, libsdl1.2-dev from build-deps + - Removed libvisual-plugins from Suggests + * debian/amarok.install: prevent installing amarok_libvisual + + -- Stephan Hermann Sun, 20 Nov 2005 18:32:06 +0100 + +amarok (1.3.6-1) unstable; urgency=low + + * New upstream bugfix release: + + + last.fm submissions are properly saved on disk while offline again; they + had been broken by Qt 3.3.5. (Closes: #334469, #337109) + + includes missing semicolon in amarok.desktop. (Closes: #336026) + + * Update my e-mail address in debian/control. + + -- Adeodato Simó Tue, 08 Nov 2005 10:40:42 +0100 + +amarok (1.3.5-1) unstable; urgency=low + + * New upstream bugfix release, quickly released to fix a potential crash at + startup (upstream #114983). + + -- Adeodato Simó Tue, 25 Oct 2005 14:55:29 +0200 + +amarok (1.3.4-1) unstable; urgency=low + + * New upstream bugfix release, which makes this maintainer of yours + immensely happy because a fix for upstream #114195 is included. + ("Collection scanner ignored files with non-ascii characters"). + + * Add libvisual support (closes: #335053). Thanks to Jean-Rémy Falleri for + the heads-up. Changes needed: + + + add libvisual0.2-dev and libsdl1.2-dev to Build-Depends. + + add libvisual0.2-plugins to Suggests, and mention it in the paragraph + regarding visualization plugins in amarok's description. + + add the appropriate snippet to some-binaries-in-usr-lib.patch in order + to cope with amarok_libvisual installed in /usr/lib/amarok instead of + /usr/bin, as mandated by Policy. + + -- Adeodato Simó Mon, 24 Oct 2005 09:30:22 +0200 + +amarok (1.3.3-1) unstable; urgency=low + + * New upstream bugfix release: + + + does not loose playlist / podcasts on restart. (Closes: #329878) + + PostgreSQL configuration dialog no longer shows MySQL's. (Closes: #327630) + + * Updated the Debian menu icons to the new logo. + + * Updated copyright notice, list of authors, and FSF postal address in + debian/copyright. + + -- Adeodato Simó Thu, 13 Oct 2005 00:04:34 +0200 + +amarok (1.3.2-1) unstable; urgency=low + + * New upstream bugfix release, featuring the return of alsasink support. + + -- Adeodato Simó Wed, 21 Sep 2005 04:14:52 +0200 + +amarok (1.3.1-2) unstable; urgency=low + + * Use g++ 3.4 in arm, m68k and hppa. + + -- Adeodato Simó Tue, 06 Sep 2005 00:21:03 +0200 + +amarok (1.3.1-1) unstable; urgency=low + + * New upstream bugfix release. Beware, though, that the GStreamer engine has + been rewritten (!), and ALSASINK SUPPORT REMOVED due to temporary breakage. + + * Use the internal copy of sqlite for now. This fixes the collection being + non functional with SQLite 3.2.5 due to this version preventing a database + handle opened in one thread to be used in another. See Bug#326648 for + reference. (Closes: #326562, #312386) + + * Enable PostgreSQL support (closes: #326612, #326713): + + + debian/rules: pass --enable-postgresql to ./configure. + + debian/control: add libpq-dev to Build-Depends. + + (Before somebody comes around with the word "bloat" ready, libpq4 is 6 + times smaller than libmysqlclient14.) + + * Regain preciousss "my `grep -c NEEDED` is smaller than yours" karma by not + using LIBADD in the statusbar convenience lib. The Depends line had gained + some weight in 1.2.3-1. + + -- Adeodato Simó Mon, 05 Sep 2005 20:57:41 +0200 + +amarok (2:1.3.1-0ubuntu4) breezy; urgency=low + + * Add kubuntu_02_column_sort_crash.diff fix a + crash on column sort http://bugs.kde.org/113042 + + -- Jonathan Riddell Tue, 4 Oct 2005 16:14:12 +0100 + +amarok (2:1.3.1-0ubuntu3) breezy; urgency=low + + * Add kubuntu_01_alsasink.diff to fix and reenable alsasink + + -- Jonathan Riddell Mon, 3 Oct 2005 22:40:05 +0100 + +amarok (2:1.3.1-0ubuntu2) breezy; urgency=low + + * debian/control: added khelpcenter as suggestion + + -- Stephan Hermann Sat, 17 Sep 2005 02:23:08 +0200 + +amarok (2:1.3.1-0ubuntu1) breezy; urgency=low + + * New Upstream Release + * Merged the Debian package from Adeodato Simó + * debian/substvars: moved gstreamer0.8-mad to Suggests section + + -- Stephan Hermann Fri, 16 Sep 2005 19:59:06 +0200 + +amarok (1.3.0-1) unstable; urgency=low + + * New upstream release packaged (closes: #323249). Bugs reported in the + Debian BTS fixed in this version: + + + does not display advertisements in lyrics. (Closes: #321499) + + pre-amp in the equalizer works with XINE engine too. (Closes: #283750) + + includes PartyMode. (Closes: #293293) + + includes equalizer presets. (Closes: #283761) + + builds fine with GCC 4.0. (Closes: #314779) + + * Updated Build-Dependencies: + + + automake1.6 to automake1.9. + + libmysqlclient12-dev to libmysqlclient14-dev. + + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev + in order to allow an early upload in the middle of the KDE transition. + + * Adjustments to the build-system: + + + do not require TagLib 1.4.0 since it's not in Debian yet (#323280). + + don't use KDE_FINAL in amarok/src since both MySQL and KDE have had the + brilliant idea to define a struct/class named "NET". + + * This version links against libtunepimp2c2, so libtunepimp2 0.3.0-4 + breakage does not affect us anymore. (Closes: #318000) + + * Update Standards-Version to 3.6.2 (no changes required). + + -- Adeodato Simó Sat, 03 Sep 2005 01:42:56 +0200 + +amarok (1.2.4-1) unstable; urgency=low + + * The "following Debian Policy is cool, except when it's not" release. + + * New upstream bugfix release: + + + amaroK now correctly displays the name of the first available engine, + instead of an empty line. (Closes: #307949) + + * The KDE Session Manager can now restore amaroK on login (closes: #302852, + #308099). Patch amarokapp to set its own argv[0] to 'amarok', since for the + session manager to restore an application the binary must be in the $PATH. + + * Made the crash handler aware that amarokapp is in /usr/lib/amarok, and not + in /usr/bin. + + * Include small patch to fix upstream bug 103510 ("systray icon continues + 'playing' after songs end, if 'clear list' was hit while playing"). + + -- Adeodato Simó Mon, 06 Jun 2005 00:08:28 +0200 + +amarok (2:1.2.4-0ubuntu4) breezy; urgency=low + + * Rebuild for the xorg -> mesa GL/GLU transition. + + -- Adam Conrad Sun, 21 Aug 2005 19:34:41 +1000 + +amarok (2:1.2.4-0ubuntu3) breezy; urgency=low + + * Add kubuntu_02_gstreamer_output.patch to default GStreamer to alsasink + + -- Jonathan Riddell Wed, 13 Jul 2005 18:19:28 +0000 + +amarok (2:1.2.4-0ubuntu2) breezy; urgency=low + + * Default to GStreamer plugin + + -- Jonathan Riddell Wed, 6 Jul 2005 15:30:52 +0000 + +amarok (2:1.2.4-0ubuntu1) breezy; urgency=low + + * New upstream release + * Add kubuntu_01_gcc4_fixes.patch to fix compiler errors + + -- Jonathan Riddell Fri, 3 Jun 2005 17:22:10 +0000 + +amarok (1.2.3-1) unstable; urgency=low + + * New upstream bugfix release. + + * This version fixes an important memory leak in the GStreamer engine that + happened when a radio stream stalled. (Closes: #299931) + + -- Adeodato Simó Tue, 29 Mar 2005 01:43:28 +0200 + +amarok (2:1.2.3-1ubuntu4) hoary; urgency=low + + * Revert back to amarok-arts on request of mdz + + -- Chris Halls Wed, 6 Apr 2005 09:33:35 +0100 + +amarok (2:1.2.3-1ubuntu3) hoary; urgency=low + + * Switch default engine to amarok-xine, which is better supported + upstream and is less buggy (Hoary: #8429, #8255) + + -- Chris Halls Mon, 4 Apr 2005 20:01:48 +0100 + +amarok (2:1.2.3-1ubuntu2) hoary; urgency=low + + * Add build-depend on libtool. + * Remove automake1.6 patch + + -- Jonathan Riddell Wed, 30 Mar 2005 14:35:20 +0100 + +amarok (2:1.2.3-1ubuntu1) hoary; urgency=low + + * Sync with Debian + + -- Jonathan Riddell Wed, 30 Mar 2005 04:25:27 +0000 + +amarok (1.2.2-1) kalyxo-unstable; urgency=low + + * New upstream bugfix release. + + * Added a menu file, plus XPM icons. + + * Switched to tarball-in-tarball for the .orig.tar.gz (which is sensibly + smaller now, since upstream uses bz2). Added bzip2 to Build-Depends. + + * Build-depend on automake1.6 and libtool, and regenerate configure and + Makefiles.in at build-time. + + * Use the kde.mk class maintained by the Debian KDE Maintainers, instead + of the one shipped with cdbs. + + -- Adeodato Simó Thu, 17 Mar 2005 19:38:34 +0100 + +amarok (1.2.1-1) unstable; urgency=low + + * New upstream bugfix release. + + * Include patch from CVS to make amaroK bind listening TCP connections to + the local interface only. Related to Bug#297693, but not the same. + + -- Adeodato Simó Fri, 04 Mar 2005 14:54:34 +0100 + +amarok (1.2.0-1) unstable; urgency=low + + * New upstream release packaged (closes: #296139). Lots of improvements and + new functionality, see the changelog or http://amarok.kde.org for details. + Bugs reported in the Debian BTS fixed with in this version: + + + the search text input element is now cleared when the user writes + something there. (Closes: #278359) + + + analyzers work with the XINE engine. (Closes: #287091) + + * amaroK's collection can be now stored in a MySQL database: + + + Build-Depend on libmysqlclient12-dev + + + Pass --enable-mysql to configure. + + * amaroK now includes a sidebar plugin for Konqueror: + + + debian/amarok.install: + - add files for the konqueror sidebar. + + + debian/control: + - added kdebase-dev as Build-Dependency. + + + debian/rules: + - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that + amarok doesn't end up depending on konqueror. (The plugin will be + ignored in systems without konqueror installed.) + + * Other changes: + + + amaroK now ships several scripts to enhance it. These are written in + Python and Ruby, so add those as suggested packages. Added note to + README.Debian about this, too. + + + removed sqlite3_in_configure.in.patch, no longer necessary in 1.2. + + + added www-browser as an alternative for the konqueror suggests, since + upstream fixed the code so that the configured browser is used. + + + renamed debian/README to debian/README.Debian, so that it gets + installed. D'oh! + + + debian/control: + - remove Build-Dependency on libkjsembed-dev, no longer needed. + + + debian/amarok.install: + - install amarok.profile.xml into /usr/share/apps/profiles. + + -- Adeodato Simó Wed, 23 Feb 2005 03:03:37 +0100 + +amarok (1.1.1-2) unstable; urgency=high + + * Upload to get rid of the dependency on libflac4, which is not longer in + the archive (closes: #289344). Urgency set to high as other packages with + RC bug fixes can't enter testing because of the libflac6 transition not + being ready. + + + Relibtoolized the package, so that binaries won't link against not + needed libraries. Introduced disable_no_undefined.patch, many thanks to + Daniel Schepler for his insight with this (and for providing the patch). + [This has reduced the number of NEEDED libraries from 45 to 18, libflac + being among them.] + + + debian/control: + - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1). + + * Some new versions of libraries have become available in Debian since the + last upload: + + + Taglib 1.3 is now in the archive: + - removed debian/patches/taglib-1.2-suffices.patch. + - update Build-Depends to libtag1-dev (>> 1.3.1). + + + SQLite 3 is now in the archive: + - changed Build-Depends on libsqlite0-dev to libsqlite3-dev. + - pass --without-included-sqlite to ./configure. + - patch configure.in to check for sqlite3 (>= 3.0). Upstream forgot to + update this check in the 1.1 series. [sqlite3_in_configure.in.patch] + + * New package relationships: + + + amarok now recommends kdemultimedia-kio-plugins, which is needed to play + audio CDs. + + + amarok now suggests konqueror, since it's called in the MusicBrainz + dialog and some other places. (Closes: #282523) + + * Created a README.Debian files with the following: + + + Explain why the amarokapp and amarok_xmmswrapper2 binaries are shipped + in /usr/lib/amarok instead of /usr/bin, differing from upstream. + + + Describe a fix for the 'Socket-path is not a link or a directory' error. + + + Explicitly mention what is needed to play audio CDs in amarok. + + * Other changes: + + + Patched admin/configure.in.min to include AM_MAINTAINER_MODE. To make + the .diff.gz stuff smaller, force automake-1.6 (which upstream uses) in + admin/detect-autoconf.sh. [am_maintainer_mode.patch, automake-1.6.patch] + + + Prevent admin/cvs.sh from creating .gmo files at "make dist" time, since + those can't be shipped in the .diff.gz. [gmo_files_at_build_time.patch] + + + debian/amarok.1: + - correct "hyphen vs. minus sign" usage. + + -- Adeodato Simó Fri, 14 Jan 2005 01:54:47 +0100 + +amarok (1.1.1-1) unstable; urgency=low + + * New upstream release packaged. Most notably, fixes several GStreamer + engine related bugs. + + * debian/control: add to amarok-gstreamer's description that is not possible + to use artssink for output. + + * debian/rules: + - call dh_install with --list-missing (DEB_DH_INSTALL_ARGS). + + * debian/patches/: + - removed proper-otherlang-handbook-path.patch, issue fixed upstream. + + -- Adeodato Simó Sat, 09 Oct 2004 22:51:06 +0200 + +amarok (1.1.0-2) unstable; urgency=low + + * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not + kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch] + + -- Adeodato Simó Mon, 27 Sep 2004 14:02:30 +0200 + +amarok (1.1.0-1) unstable; urgency=low + + * New upstream version: + - several last minute fixes. + - includes handbook in several languages (da, et, fr, it, pt, sv). + + * First upload to Debian (closes: #236696). + + -- Adeodato Simó Mon, 27 Sep 2004 01:53:56 +0200 + +amarok (1.1-cvs-0+kalyxo1) experimental; urgency=low + + * New maintainer. Thanks to Peter Rockai for his initial work. + + * Updated to amaroK 1.1 CVS (2004-09-24): + - temporarily link statically against libsqlite, since sqlite >= 3.0.7 is + required and is not available in Debian (requested in #272271). + - added debian/patches/taglib-1.2-suffices.patch to lower the requirement + from taglib 1.3 (requested in #273029) to 1.2, which is enough. + - new package amarok-xine (yet another engine for amaroK, hurray!) + - added the following Build-Dependencies: + + libkjsembed-dev (amaroK is now JavaScript scriptable). + + libtunepimp2-dev (MusicBrainz support). + + libxine-dev (for the xine engine). + + libtag1-dev (missing). + + * New package amarok-engines: + - depends on all the available engine packages and will be installed by + default unless the user specifies an specific engine. + - all the amarok-* packages Provide: amarok-engine, and amarok now + Depends: amarok-engines | amarok-engine. + + * Removed the amarok-xmms package: + - its single binary amarok_xmmswrapper2 is now included in the main amarok + package. + - include some hackery to prevent amarok from depending on xmms (!). + amaroK just does a no-op and issues a warning on stderr if xmms is not + installed and user opens the visualizations menu, so this seems safe. + A xmms-lib package (in which amarok could easily depend) is requested in + #272913. + + * Install amarokapp and amarok_xmmswrapper2 in /usr/lib/amarok instead of + /usr/bin: + - needed for FHS/Debian Policy compliance. + - added debian/patches/some-binaries-in-usr-lib.patch to fix locations in + source (amarok/src/loader/loader.cpp, amarok/src/socketserver.cpp). + + * Added lintian overrides for an aRts module which must go in /usr/lib + despite not being a shared library. noatun and some other arts-related + packages have the same problem, if someone has a solution please share. + + * Made /usr/share/doc/amarok-* symlinks to /usr/share/doc/amarok. + + * Do not make amarok-arts depend on the meta-package "arts"; the + dependencies given by ${shlib:Depends} do suffice. + + * debian/control: updated to Standars-Version 3.6.1. + + -- Adeodato Simó Fri, 24 Sep 2004 02:49:46 +0200 + +amarok (1.0.2-1) unstable; urgency=low + + * New upstream version. + + -- Peter Rockai (mornfall) Thu, 5 Aug 2004 14:23:23 +0200 + +amarok (1.0.1-1) unstable; urgency=low + + * New upstream version + * Make depends among amarok packages versioned + * Prepare to upload into Debian, closes: #236696 + * Add manpage for amarok by Alejandro Exojo + + -- Peter Rockai (mornfall) Wed, 30 Jun 2004 23:24:16 +0200 + +amarok (1.0.0-3) unstable; urgency=low + + * Dynamically link against libsqlite0 + * Fix gstreamer dependencies + * Various small fixes (sections, descriptions, doc dirs) + * Thanks go to Adeodato Simó for help with various issues + + -- Peter Rockai (mornfall) Sat, 26 Jun 2004 23:06:00 +0200 + +amarok (1.0.0-2) unstable; urgency=low + + * Make the depends on amarok-gstreamer a bit more tight. Only depend on + audiosink, recommend the decoder plugins. + * Make the amarok engines depend on amarok itself. + * Compile with xmms visualisation support. + + -- Peter Rockai (mornfall) Wed, 23 Jun 2004 13:58:12 +0200 + +amarok (1.0.0-1) unstable; urgency=low + + * Build official 1.0.0 release. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 23:48:52 +0200 + +amarok (1.0-pre1-2) unstable; urgency=low + + * Fix amarok-arts package, was missing mcop files. Duh. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 23:25:29 +0200 + +amarok (1.0-pre1-1) unstable; urgency=low + + * First 1.0.0 prerelease. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 10:18:31 +0200 + +amarok (1.0-beta4-2) unstable; urgency=low + + * Patch to final beta4 version. + + -- Peter Rockai (mornfall) Tue, 1 Jun 2004 17:47:53 +0200 + +amarok (1.0-beta4-1) unstable; urgency=low + + * New upstream RC (beta4-rc1). + * Build with GST support. + + -- Peter Rockai (mornfall) Tue, 1 Jun 2004 10:24:09 +0200 + +amarok (1.0-beta3-1) unstable; urgency=low + + * New upstream release. + + -- Peter Rockai (mornfall) Sat, 29 May 2004 17:08:55 +0200 + +amarok (1.0-beta1-0) workstation-unstable; urgency=low + + * Initial packaging + + -- Peter Rockai (mornfall) Sun, 11 Apr 2004 17:05:00 +0200 --- amarok-1.4.3.orig/debian/amarok.menu +++ amarok-1.4.3/debian/amarok.menu @@ -0,0 +1,8 @@ +?package(amarok):\ + needs="X11"\ + section="Apps/Sound"\ + hints="KDE"\ + title="amaroK"\ + icon32x32="/usr/share/pixmaps/amarok.xpm"\ + icon16x16="/usr/share/pixmaps/amarok-16.xpm"\ + command="/usr/bin/amarok" --- amarok-1.4.3.orig/debian/compat +++ amarok-1.4.3/debian/compat @@ -0,0 +1 @@ +5 --- amarok-1.4.3.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ amarok-1.4.3/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,11 @@ +don't use tar build +use /usr/share/cdbs/1/class/kde.mk +don't build-dep on xmms-dev and add --without-xmms +don't build-dep on libexscalibar1-dev +amarok depends on ruby not recommends +build-dep on ruby +debian/install-mp3 /usr/lib/amarok +amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services +Depend on amarok-xine | amarok-engine not amarok-engines +Install amarokapp in /usr/bin, instead of /usr/lib/amarok and link from /usr/lib/amarok +build-dep on automake1.9 not automake1.7 --- amarok-1.4.3.orig/debian/README.Debian +++ amarok-1.4.3/debian/README.Debian @@ -0,0 +1,35 @@ +amaroK packages for Debian +========================== + + A couple of notes which you may find useful: + + - starting with amaroK 1.4, lyrics downloading is implemented in a + separate Ruby script; if you want to use this feature, you'll have + to install the 'ruby' package. + + - if you want amarok to be able to play CDs, you need to install the + kdemultimedia-kio-plugins package. + + - the scripts available in the 'Scripts' menu need that you install + some other packages for them to work. Those packages are listed in + the Suggests: field of the amarok package. + + - these Debian packages ship the amarokapp and amarok_xmmswrapper2 + binaries in /usr/lib/amarok instead of /usr/bin, which upstream + does. This is done to comply with Debian Policy, which mandates + that binaries not meant to be invoked by the user shall not reside + in /usr/bin. + + You should experience no problems because of this change. If you + do, please let me know. + + Also, users not using the full KDE environment may get the following + error when executing amarok for the first time: "Socket-path is not a + link or a directory: /home/$USER/.kde/socket-$HOSTNAME". Just execute: + + $ lnusertemp socket + + Note that you only need to execute it once, not each time that you + start amaroK. + + -- Adeodato Simó --- amarok-1.4.3.orig/debian/patches/kubuntu_01_kdepot.diff +++ amarok-1.4.3/debian/patches/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 --- amarok-1.4.3.orig/debian/patches/kubuntu_05_playlist_encoding.diff +++ amarok-1.4.3/debian/patches/kubuntu_05_playlist_encoding.diff @@ -0,0 +1,10 @@ +--- amarok/amarok/src/playlist.cpp (Revision 583705) ++++ amarok/amarok/src/playlist.cpp (Revision 583706) +@@ -3188,6 +3188,7 @@ + stream << "\n"; + + QTextStream fstream( &file ); ++ fstream.setEncoding( QTextStream::UnicodeUTF8 ); + fstream << buffer; + } + --- amarok-1.4.3.orig/debian/patches/disable-final.diff +++ amarok-1.4.3/debian/patches/disable-final.diff @@ -0,0 +1,10 @@ +--- amarok/src/Makefile.am.orig ++++ amarok/src/Makefile.am +@@ -8,6 +8,7 @@ + KONQSIDEBAR_SUBDIR = konquisidebar + endif + ++KDE_OPTIONS = nofinal + + lib_LTLIBRARIES = libamarok.la + --- amarok-1.4.3.orig/debian/patches/no_libadd_in_convenience_libs.diff +++ amarok-1.4.3/debian/patches/no_libadd_in_convenience_libs.diff @@ -0,0 +1,11 @@ +--- amarok/src/statusbar/Makefile.am.orig ++++ amarok/src/statusbar/Makefile.am +@@ -9,8 +9,6 @@ + -I$(top_srcdir)/amarok/src/engine \ + -I$(top_builddir)/amarok/src/ \ + $(all_includes) +- +-libstatusbar_la_LIBADD = $(LIB_QT) + + libstatusbar_la_SOURCES = \ + statusBarBase.cpp \ --- amarok-1.4.3.orig/debian/patches/kubuntu_04_install_mp3.diff +++ amarok-1.4.3/debian/patches/kubuntu_04_install_mp3.diff @@ -0,0 +1,10 @@ +--- amarok/amarok/src/engine/xine/amarok_xine-mp3_install.desktop~ 2006-07-02 19:37:44.000000000 +0000 ++++ amarok/amarok/src/engine/xine/amarok_xine-mp3_install.desktop 2006-07-05 01:07:35.000000000 +0000 +@@ -3,5 +3,6 @@ + ServiceTypes=Amarok/CodecInstall + X-KDE-Amarok-codec=mp3 + X-KDE-Amarok-engine=xine-engine +-Exec=kdialog --msgbox "Hello World" ++Exec=/usr/lib/amarok/install-mp3 ++ + --- amarok-1.4.3.orig/debian/patches/gmo_files_at_build_time.patch +++ amarok-1.4.3/debian/patches/gmo_files_at_build_time.patch @@ -0,0 +1,11 @@ +--- admin/cvs.sh.orig ++++ admin/cvs.sh +@@ -204,7 +204,7 @@ + ### + ### Then make messages + ### +-if test -d po; then ++if test -d po && false; then + LIST=`find ./po -name "*.po"` + for i in $LIST; do + file2=`echo $i | sed -e "s#\.po#\.gmo#"` --- amarok-1.4.3.orig/debian/patches/some-binaries-in-usr-lib.patch +++ amarok-1.4.3/debian/patches/some-binaries-in-usr-lib.patch @@ -0,0 +1,110 @@ +--- amarok/src/loader/loader.cpp.orig ++++ amarok/src/loader/loader.cpp +@@ -66,7 +66,7 @@ + // this argument cannot be passed to the running amarokapp + // or KCmdLineArgs would exit the application + +- QProcess proc( QString("amarokapp") ); ++ QProcess proc( QString("/usr/lib/amarok/amarokapp") ); + proc.setCommunication( 0 ); //show everything + proc.addArgument( arg ); + proc.start(); +@@ -146,7 +146,7 @@ + if( !QApplication::isSessionRestored() && isSplashEnabled() ) + m_splash = new Splash; + +- args.prepend( "amarokapp" ); ++ args.prepend( "/usr/lib/amarok/amarokapp" ); + + m_proc = new QProcess( args, this ); + m_proc->setCommunication( QProcess::Stdout ); +--- amarok/src/socketserver.cpp.orig ++++ amarok/src/socketserver.cpp +@@ -193,23 +193,23 @@ + + //can I get a pointer to the data section of a QCString? + char str[4096]; +- FILE *vis = popen( "amarok_xmmswrapper2 --list", "r" ); ++ FILE *vis = popen( "/usr/lib/amarok/amarok_xmmswrapper2 --list", "r" ); + str[ fread( static_cast( str ), sizeof(char), 4096, vis ) ] = '\0'; + pclose( vis ); + + QStringList entries = QStringList::split( '\n', QString::fromLocal8Bit( str ) ); + + for( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) +- new Item( this, "amarok_xmmswrapper2", *it, "xmms" ); ++ new Item( this, "/usr/lib/amarok/amarok_xmmswrapper2", *it, "xmms" ); + +- vis = popen( "amarok_libvisual --list", "r" ); ++ vis = popen( "/usr/lib/amarok/amarok_libvisual --list", "r" ); + str[ fread( static_cast( str ), sizeof(char), 4096, vis ) ] = '\0'; + pclose( vis ); + + entries = QStringList::split( '\n', QString::fromLocal8Bit( str ) ); + + for( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) +- new Item( this, "amarok_libvisual", *it, "libvisual" ); ++ new Item( this, "/usr/lib/amarok/amarok_libvisual", *it, "libvisual" ); + + resize( sizeHint() + QSize(20,0) ); + // Center the widget on screen +--- amarok/src/main.cpp.orig ++++ amarok/src/main.cpp +@@ -91,6 +91,8 @@ + aboutData.addCredit( "Sven Krohlas", I18N_NOOP( "roKymoter (sven423)" ), "sven@asbest-online.de" ); + aboutData.addCredit( "Whitehawk Stormchaser", I18N_NOOP( "Tester, patches" ), "zerokode@gmx.net" ); + ++ strncpy(argv[0], "amarok", strlen(argv[0])); ++ + KApplication::disableAutoDcopRegistration(); + + App::initCliArgs( argc, argv ); +--- amarok/src/amarokcore/crashhandler.cpp.orig ++++ amarok/src/amarokcore/crashhandler.cpp +@@ -134,7 +134,7 @@ + QCString gdb; + gdb = "gdb --nw -n --batch -x "; + gdb += temp.name().latin1(); +- gdb += " amarokapp "; ++ gdb += " /usr/lib/amarok/amarokapp "; + gdb += QCString().setNum( ::getppid() ); + + QString bt = runCommand( gdb ); +@@ -147,7 +147,7 @@ + + /// analyze usefulness + bool useful = true; +- const QString fileCommandOutput = runCommand( "file `which amarokapp`" ); ++ const QString fileCommandOutput = runCommand( "file /usr/lib/amarok/amarokapp" ); + + if( fileCommandOutput.find( "not stripped", false ) == -1 ) + subject += "[___stripped]"; //same length as below +@@ -182,7 +182,7 @@ + //TODO pass the CXXFLAGS used with the email + + if( useful ) { +- body += "==== file `which amarokapp` =======\n"; ++ body += "==== file /usr/lib/amarok/amarokapp =======\n"; + body += fileCommandOutput + "\n\n"; + body += "==== (gdb) bt =====================\n"; + body += bt + "\n\n"; +--- amarok/src/scancontroller.cpp.orig ++++ amarok/src/scancontroller.cpp +@@ -92,7 +92,7 @@ + connect( m_scanner, SIGNAL( readReady( KProcIO* ) ), SLOT( slotReadReady() ) ); + + +- *m_scanner << "amarokcollectionscanner"; ++ *m_scanner << "/usr/lib/amarok/amarokcollectionscanner"; + *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV + + // KProcess must be started from the GUI thread, so we're invoking the scanner +@@ -396,7 +396,7 @@ + m_scanner = new ScannerProcIO(); + connect( m_scanner, SIGNAL( readReady( KProcIO* ) ), SLOT( slotReadReady() ) ); + +- *m_scanner << "amarokcollectionscanner"; ++ *m_scanner << "/usr/lib/amarok/amarokcollectionscanner"; + *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV + if( m_incremental ) *m_scanner << "-i"; + *m_scanner << "-s"; --- amarok-1.4.3.orig/debian/patches/series +++ amarok-1.4.3/debian/patches/series @@ -0,0 +1,6 @@ +am_maintainer_mode.patch -p0 +disable_no_undefined.patch -p0 +no_libadd_in_convenience_libs.diff -p0 +gmo_files_at_build_time.patch -p0 +disable-final.diff -p0 +some-binaries-in-usr-lib.patch -p0 --- amarok-1.4.3.orig/debian/patches/disable_no_undefined.patch +++ amarok-1.4.3/debian/patches/disable_no_undefined.patch @@ -0,0 +1,18 @@ +--- admin/acinclude.m4.in.orig ++++ 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) --- amarok-1.4.3.orig/debian/patches/am_maintainer_mode.patch +++ amarok-1.4.3/debian/patches/am_maintainer_mode.patch @@ -0,0 +1,11 @@ +--- admin/configure.in.min.orig ++++ 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 --- amarok-1.4.3.orig/debian/copyright +++ amarok-1.4.3/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Peter Rockai (mornfall) + on +Sun, 11 Apr 2004 17:06:00 +0200. + +Adeodato Simó took over the maintenance on +Wed, 22 Sep 2004 06:04:25 +0200. + +It was downloaded from http://amarok.kde.org/ + +Upstream Authors: + Christian Muehlhaeuser + Frederik Holljen + Mark Kretschmann + Max Howell + Mike Diehl + Pierpaolo Di Panfilo + Roman Becker + Seb Ruiz + Stanislav Karchebny + +Copyright: +(c) 2002-2003, Mark Kretschmann +(c) 2003-2005, The amaroK Development Squad + + 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; version 2 dated June, 1991. + + This package 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 St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL file. --- amarok-1.4.3.orig/debian/amarok.1 +++ amarok-1.4.3/debian/amarok.1 @@ -0,0 +1,181 @@ +.\" Generated by kdemangen.pl and edited by hand +.TH AMAROK 1 "Mar 2004" "K Desktop Environment" "An audio player for KDE" +.SH NAME +amarok +\- An audio player for KDE +.SH SYNOPSIS +amarok [Qt-options] [KDE-options] [URL(s)] +.SH DESCRIPTION +amaroK is a multimedia player based on the soundserver-independent framework. +There are many media players around these days, true. What's missing from most +players is a user interface, that doesn't get in the way of the user. +.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 +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. +.SS +.SS Arguments: +URL(s) Files/URLs to Open +.SS +.SS Options: +.TP +.B \-r, \-\-previous +Skip backwards in playlist +.TP +.B \-p, \-\-play +Start playing current playlist +.TP +.B \-s, \-\-stop +Stop playback +.TP +.B \-\-pause +Pause playback +.TP +.B \-f, \-\-next +Skip forwards in playlist +.SS +.SS Additional options: +.TP +.B \-e, \-\-enqueue +Enqueue Files/URLs + +.SH SEE ALSO +Full user documentation is available through the KDE Help Center. You can also enter the URL +.BR help:/amarok/ +directly into konqueror or you can run +.BR "`khelpcenter help:/amarok/'" +from the command-line. +.BR +.SH AUTHORS +.NF +Christian Muehlhaeuser <chris@chris.de> +.BR +Mark Kretschmann <markey@web.de> +.BR +Max Howell <max.howell@methylblue.com> +.BR +Stanislav Karchebny <berk@upnet.ru> +.BR +Please use http://bugs.kde.org to report bugs, do not mail the authors directly. +.BR +.SH OTHER +This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian +system (but may be used by others). +.BR --- amarok-1.4.3.orig/debian/amarok-xine.install +++ amarok-1.4.3/debian/amarok-xine.install @@ -0,0 +1,4 @@ +debian/tmp/usr/share/services/amarok_xine-engine.desktop +debian/tmp/usr/share/config.kcfg/xinecfg.kcfg +debian/tmp/usr/lib/kde3/libamarok_xine-engine.so +debian/tmp/usr/lib/kde3/libamarok_xine-engine.la --- amarok-1.4.3.orig/Makefile.in +++ amarok-1.4.3/Makefile.in @@ -133,6 +133,7 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_CONFIG = @GTK_CONFIG@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ IFP_INCLUDES = @IFP_INCLUDES@ @@ -225,6 +226,9 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ @@ -273,6 +277,7 @@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ XINE_CONFIG = @XINE_CONFIG@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XMMS_CONFIG = @XMMS_CONFIG@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -280,12 +285,9 @@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -308,8 +310,11 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +docdir = @docdir@ +dvidir = @dvidir@ enable_mysql_FALSE = @enable_mysql_FALSE@ enable_mysql_TRUE = @enable_mysql_TRUE@ enable_postgresql_FALSE = @enable_postgresql_FALSE@ @@ -323,6 +328,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ include_ARTS_FALSE = @include_ARTS_FALSE@ include_ARTS_TRUE = @include_ARTS_TRUE@ include_x11_FALSE = @include_x11_FALSE@ @@ -355,18 +361,21 @@ kdeinitdir = @kdeinitdir@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ mysql_includes = @mysql_includes@ mysql_libs = @mysql_libs@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ postgresql_includes = @postgresql_includes@ postgresql_libs = @postgresql_libs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ ruby_includes = @ruby_includes@ @@ -426,7 +435,7 @@ .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps) #>- @for dep in $?; do \ #>- case '$(am__configure_deps)' in \ #>- *$$dep*) \ @@ -468,12 +477,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 @@ -485,7 +494,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 $@ @@ -992,8 +1001,30 @@ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: +clean-bcheck: + rm -f *.bchecktest.cc *.bchecktest.cc.class a.out + +bcheck: bcheck-recursive + +bcheck-am: + @for i in ; do \ + if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ + echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ + echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ + echo "$$i"; \ + if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ + rm -f $$i.bchecktest.cc; exit 1; \ + fi ; \ + echo "" >> $$i.bchecktest.cc.class; \ + perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ + rm -f a.out; \ + fi ; \ + done + + + #>+ 2 -KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in +KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in #>+ 2 docs-am: --- amarok-1.4.3.orig/config.h.in +++ amarok-1.4.3/config.h.in @@ -198,22 +198,22 @@ /* sched_setaffinity works correctly */ #undef SCHEDAFFINITY_SUPPORT -/* 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 /* Determine pointer size for SQLite */ --- amarok-1.4.3.orig/acinclude.m4 +++ amarok-1.4.3/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) @@ -5968,30 +5959,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) @@ -6051,7 +6027,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 @@ -6101,7 +6077,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. @@ -6121,7 +6097,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" @@ -6141,6 +6117,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" @@ -6160,15 +6137,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*) @@ -6209,11 +6188,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 @@ -6286,15 +6310,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 @@ -6463,14 +6487,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*) @@ -6482,7 +6505,6 @@ esac ;; *64-bit*) - LINUX_64_MODE="64" case $host in x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" @@ -6516,6 +6538,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) @@ -6547,7 +6585,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) @@ -6557,8 +6595,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 @@ -6584,11 +6624,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 @@ -6612,7 +6657,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*) @@ -6641,20 +6686,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. @@ -6671,7 +6766,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -6679,7 +6774,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 : @@ -6745,17 +6840,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 @@ -6767,7 +6864,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 @@ -6804,7 +6901,7 @@ lt_cv_dlopen_self=yes ]) ;; - + *) AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], @@ -6838,7 +6935,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" @@ -6851,7 +6948,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( @@ -6893,20 +6990,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) @@ -6918,13 +7008,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* @@ -6983,8 +7078,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 && @@ -7041,7 +7136,7 @@ *) AC_MSG_RESULT([no]) ;; - esac + esac fi ])# AC_LIBTOOL_SYS_LIB_STRIP @@ -7054,7 +7149,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -7064,7 +7159,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 @@ -7129,7 +7237,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*) @@ -7138,7 +7246,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}' @@ -7154,7 +7262,7 @@ cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -7166,7 +7274,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' @@ -7196,7 +7305,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 ;; @@ -7219,7 +7328,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"` @@ -7242,20 +7351,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*) @@ -7273,14 +7379,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 ;; @@ -7300,9 +7411,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 @@ -7317,7 +7428,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 @@ -7328,7 +7439,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 @@ -7340,6 +7451,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 ;; @@ -7383,29 +7506,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, @@ -7415,6 +7535,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 @@ -7424,7 +7556,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 @@ -7452,8 +7584,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 @@ -7473,7 +7610,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' @@ -7491,13 +7628,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 @@ -7523,7 +7653,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' @@ -7556,6 +7686,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}' @@ -7569,6 +7722,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 @@ -7593,6 +7751,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. @@ -7619,7 +7780,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="" @@ -7681,7 +7844,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 @@ -7719,7 +7882,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) @@ -7855,7 +8018,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 @@ -7965,7 +8128,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'*) @@ -7997,7 +8160,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 @@ -8024,6 +8187,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 @@ -8057,44 +8229,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.*` ;; @@ -8110,7 +8274,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 @@ -8126,43 +8290,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 @@ -8181,32 +8329,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]]' @@ -8227,10 +8365,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 @@ -8250,36 +8391,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" @@ -8311,13 +8459,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 @@ -8336,13 +8484,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 @@ -8380,10 +8528,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 # -------------- @@ -8423,7 +8582,7 @@ # AC_LIBTOOL_RC -# -------------- +# ------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) @@ -8456,36 +8615,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 @@ -8499,9 +8631,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]) @@ -8510,7 +8642,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 @@ -8519,48 +8651,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]) @@ -8585,7 +8680,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)= @@ -8597,6 +8692,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)= @@ -8614,7 +8710,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 @@ -8624,11 +8720,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 @@ -8639,18 +8739,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 @@ -8668,8 +8768,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' @@ -8695,7 +8795,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 @@ -8725,8 +8825,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 @@ -8743,7 +8858,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` @@ -8762,8 +8877,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 @@ -8772,15 +8891,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. @@ -8789,13 +8909,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 @@ -8804,35 +8923,45 @@ # -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 - ;; - esac + + 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 ;; cygwin* | mingw* | pw32*) # _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 @@ -8841,70 +8970,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 @@ -8915,14 +9055,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 @@ -8939,12 +9079,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. @@ -8953,11 +9093,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 @@ -8967,34 +9107,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, @@ -9004,17 +9133,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 @@ -9030,12 +9162,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 @@ -9046,11 +9181,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 @@ -9061,9 +9210,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 @@ -9072,16 +9221,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. @@ -9099,20 +9248,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' @@ -9140,7 +9313,7 @@ ;; mvs*) case $cc_basename in - cxx) + cxx*) # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -9150,7 +9323,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= @@ -9161,15 +9334,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)=: @@ -9179,14 +9368,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)=: @@ -9204,7 +9393,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)=: @@ -9223,13 +9412,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)=: @@ -9238,17 +9427,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' @@ -9267,7 +9456,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)=: @@ -9288,27 +9477,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 @@ -9321,36 +9497,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 @@ -9358,9 +9531,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' @@ -9370,9 +9543,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 @@ -9381,9 +9554,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 @@ -9396,12 +9569,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 @@ -9438,8 +9662,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) @@ -9457,7 +9679,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 @@ -9511,7 +9733,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 @@ -9551,7 +9773,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 @@ -9587,13 +9809,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'. @@ -9637,12 +9883,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]) @@ -9652,7 +9902,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 @@ -9660,8 +9910,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]) @@ -9671,8 +9923,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" @@ -9682,8 +9932,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) @@ -9712,20 +9960,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 @@ -9737,8 +9992,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) @@ -9748,7 +10001,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'. @@ -9772,11 +10025,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) @@ -9802,11 +10060,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 \ @@ -9856,7 +10115,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 | \ @@ -9922,11 +10181,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= @@ -9957,6 +10216,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 @@ -9968,6 +10233,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) @@ -9987,7 +10255,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 @@ -10018,7 +10286,7 @@ libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -10033,7 +10301,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? @@ -10262,7 +10530,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 @@ -10304,9 +10575,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'" @@ -10328,14 +10596,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]]' @@ -10353,14 +10637,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 @@ -10516,6 +10803,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 @@ -10524,7 +10815,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*) ;; *) @@ -10549,18 +10840,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' ;; @@ -10568,22 +10869,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 ;; @@ -10596,9 +10897,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. @@ -10607,20 +10912,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. @@ -10637,25 +10948,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 @@ -10669,24 +10980,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' ;; @@ -10696,12 +10998,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' ;; @@ -10711,7 +11013,7 @@ ;; tandem*) case $cc_basename in - NCC) + NCC*) # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; @@ -10719,7 +11021,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*) ;; @@ -10766,6 +11075,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. @@ -10782,7 +11096,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 ;; @@ -10808,6 +11122,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 @@ -10819,7 +11143,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 ;; @@ -10842,13 +11166,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. @@ -10863,15 +11194,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*) @@ -10880,7 +11211,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' @@ -10893,6 +11224,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' @@ -10920,7 +11262,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)= @@ -10929,6 +11271,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)=]) ]) @@ -10953,7 +11305,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' @@ -10979,7 +11334,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* @@ -10996,7 +11351,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 @@ -11006,6 +11362,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 ;; @@ -11016,6 +11376,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*) @@ -11053,7 +11434,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 @@ -11063,13 +11444,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 @@ -11078,23 +11459,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 @@ -11108,13 +11536,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= @@ -11124,24 +11579,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) @@ -11153,7 +11603,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 @@ -11175,9 +11625,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 @@ -11194,7 +11656,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` @@ -11213,8 +11675,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 @@ -11222,30 +11688,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 @@ -11254,13 +11720,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 ;; @@ -11273,7 +11737,7 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - bsdi4*) + bsdi[[45]]*) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -11283,69 +11747,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*) @@ -11378,8 +11842,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 @@ -11387,7 +11851,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 @@ -11401,47 +11865,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' @@ -11455,7 +11934,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' @@ -11465,7 +11944,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 @@ -11488,7 +11967,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 @@ -11498,7 +11978,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 @@ -11509,14 +11989,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' @@ -11528,13 +12008,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' @@ -11542,21 +12022,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' @@ -11565,8 +12039,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 ;; @@ -11575,7 +12059,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 @@ -11623,36 +12107,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*) @@ -11670,11 +12163,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? # @@ -11695,13 +12183,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= @@ -11829,7 +12318,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